Merge "Commit of various live hacks"
authorCatrope <roan.kattouw@gmail.com>
Mon, 30 Apr 2012 19:20:11 +0000 (19:20 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 30 Apr 2012 19:20:11 +0000 (19:20 +0000)

Trivial merge