Merge "mediawiki.action.edit.stash: set timeout to 4 seconds"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 12 Jan 2015 19:09:40 +0000 (19:09 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 12 Jan 2015 19:09:40 +0000 (19:09 +0000)

Trivial merge