Merge "fix fatal error in HttpTest"
authorAaron Schulz <aschulz@wikimedia.org>
Wed, 24 Oct 2012 21:57:02 +0000 (21:57 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 24 Oct 2012 21:57:02 +0000 (21:57 +0000)

Trivial merge