Merge "Templates for configuration guide" into stable/brahmaputra
authorNarinder Gupta <narinder.gupta@canonical.com>
Tue, 12 Jan 2016 05:51:46 +0000 (05:51 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Tue, 12 Jan 2016 05:51:46 +0000 (05:51 +0000)

Trivial merge