Merge "1.24 -> 1.25"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 6 Nov 2014 21:14:23 +0000 (21:14 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 6 Nov 2014 21:14:23 +0000 (21:14 +0000)

Trivial merge