3220: Merge branch '3220-http-status-codes' closes #3220
authorTom Clegg <tom@curoverse.com>
Wed, 16 Jul 2014 13:36:19 +0000 (09:36 -0400)
committerTom Clegg <tom@curoverse.com>
Wed, 16 Jul 2014 13:36:19 +0000 (09:36 -0400)

Trivial merge