Merge "Network descriptions added to network_settings.yaml" into stable/brahmaputra
authorTim Rozet <trozet@redhat.com>
Thu, 4 Feb 2016 00:50:25 +0000 (00:50 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Thu, 4 Feb 2016 00:50:25 +0000 (00:50 +0000)

Trivial merge