Merge "Templates for configuration guide"
authorJonas Bjurel <jonas.bjurel@ericsson.com>
Thu, 7 Jan 2016 12:07:55 +0000 (12:07 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Thu, 7 Jan 2016 12:07:55 +0000 (12:07 +0000)

Trivial merge