Merge branch '6663-git-server' refs #6663
authorTom Clegg <tom@curoverse.com>
Wed, 5 Aug 2015 16:25:15 +0000 (12:25 -0400)
committerTom Clegg <tom@curoverse.com>
Wed, 5 Aug 2015 16:25:15 +0000 (12:25 -0400)

Trivial merge