5416: Merge remote-tracking branch 'origin/5416-arv-git-httpd' into 5416-arv-git...
authorTom Clegg <tom@curoverse.com>
Tue, 24 Mar 2015 20:22:46 +0000 (16:22 -0400)
committerTom Clegg <tom@curoverse.com>
Tue, 24 Mar 2015 20:22:46 +0000 (16:22 -0400)

Trivial merge