Merge "Fix variable collision"
authorAaron Schulz <aschulz@wikimedia.org>
Sat, 7 Apr 2012 23:37:32 +0000 (23:37 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sat, 7 Apr 2012 23:37:32 +0000 (23:37 +0000)

Trivial merge