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

Trivial merge