Merge "Revert "thumb.php now handles short and long thumbnail name formats when possi...
authorAaron Schulz <aschulz@wikimedia.org>
Thu, 6 Sep 2012 17:54:59 +0000 (17:54 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 6 Sep 2012 17:54:59 +0000 (17:54 +0000)

Trivial merge