Merge "Prepare for 1.30 branch"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 27 Apr 2017 18:42:29 +0000 (18:42 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 27 Apr 2017 18:42:29 +0000 (18:42 +0000)

Trivial merge