Merge "Fatal error: Call to a member function getId() on a non-object in /usr/local...
authorAaron Schulz <aschulz@wikimedia.org>
Sat, 28 Apr 2012 22:22:12 +0000 (22:22 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sat, 28 Apr 2012 22:22:12 +0000 (22:22 +0000)

Trivial merge