Merge "Remove commented defines"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 29 Jan 2014 23:41:14 +0000 (23:41 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 29 Jan 2014 23:41:14 +0000 (23:41 +0000)

Trivial merge