Merge "Add some settings and quoted test in code tags"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 8 Apr 2014 18:42:41 +0000 (18:42 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 8 Apr 2014 18:42:41 +0000 (18:42 +0000)

Trivial merge