Merge "Bring in https://www.mediawiki.org/wiki/Special:Code/MediaWiki/114376"
authorAaron Schulz <aschulz@wikimedia.org>
Fri, 23 Mar 2012 02:53:49 +0000 (02:53 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 23 Mar 2012 02:53:49 +0000 (02:53 +0000)

Trivial merge