Merge branch '5416-arv-git-httpd' refs #5416
authorTom Clegg <tom@curoverse.com>
Mon, 30 Mar 2015 19:56:34 +0000 (15:56 -0400)
committerTom Clegg <tom@curoverse.com>
Mon, 30 Mar 2015 19:56:34 +0000 (15:56 -0400)

Trivial merge