Merge branch '9950-arv-git-httpd-config' closes #9950
authorTom Clegg <tom@curoverse.com>
Mon, 26 Sep 2016 17:44:16 +0000 (13:44 -0400)
committerTom Clegg <tom@curoverse.com>
Mon, 26 Sep 2016 17:44:16 +0000 (13:44 -0400)

Trivial merge