Merge "Cleanup - let's make IDEs more useful"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 13 Aug 2014 20:08:54 +0000 (20:08 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 13 Aug 2014 20:08:54 +0000 (20:08 +0000)

Trivial merge