Merge "Forward port of https://www.mediawiki.org/wiki/Special:Code/MediaWiki/105964"
authorCatrope <roan.kattouw@gmail.com>
Mon, 30 Apr 2012 19:18:10 +0000 (19:18 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 30 Apr 2012 19:18:10 +0000 (19:18 +0000)

Trivial merge