Merge "mediawiki.action.edit: Merge with mediawiki.action.edit.stash"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 16 Jun 2016 21:47:55 +0000 (21:47 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 16 Jun 2016 21:47:55 +0000 (21:47 +0000)

Trivial merge