Merge "Revert changes from 792a960b2e3404235b4b195edb8333cd57372b90."
authorSiebrand Mazeland <s.mazeland@xs4all.nl>
Tue, 3 Jul 2012 08:32:35 +0000 (08:32 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 3 Jul 2012 08:32:35 +0000 (08:32 +0000)

Trivial merge