Merge "Fatal error: Call to a member function getExtension() on a non-object in...
authorAaron Schulz <aschulz@wikimedia.org>
Sat, 28 Apr 2012 06:17:19 +0000 (06:17 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sat, 28 Apr 2012 06:17:19 +0000 (06:17 +0000)

Trivial merge