Merge "Follow up: I1b017e13 - Fix Strict Standards"
authorAaron Schulz <aschulz@wikimedia.org>
Sat, 24 Nov 2012 22:02:26 +0000 (22:02 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sat, 24 Nov 2012 22:02:26 +0000 (22:02 +0000)

Trivial merge