Merge "Fix Tidy quietly breaking TOC disabling"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 25 Oct 2013 19:44:11 +0000 (19:44 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 25 Oct 2013 19:44:11 +0000 (19:44 +0000)

Trivial merge