Merge "Remove support for magic_quotes_gpc"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 23 Jul 2014 20:52:54 +0000 (20:52 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 23 Jul 2014 20:52:54 +0000 (20:52 +0000)

Trivial merge