Merge "$timeout was optional in Http::get()"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 2 Mar 2015 20:04:34 +0000 (20:04 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 2 Mar 2015 20:04:34 +0000 (20:04 +0000)

Trivial merge