Merge "adding doc for new settings files"
authorTim Rozet <trozet@redhat.com>
Tue, 12 Jan 2016 20:51:20 +0000 (20:51 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Tue, 12 Jan 2016 20:51:21 +0000 (20:51 +0000)

Trivial merge