Merge "Revert "Bit more refactoring""
authorCatrope <roan.kattouw@gmail.com>
Fri, 13 Apr 2012 00:25:41 +0000 (00:25 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 13 Apr 2012 00:25:41 +0000 (00:25 +0000)

Trivial merge