Merge "Removed now obsolete compat-code"
authorTim Starling <tstarling@wikimedia.org>
Wed, 25 Jul 2012 04:09:03 +0000 (04:09 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 25 Jul 2012 04:09:03 +0000 (04:09 +0000)

Trivial merge