Merge "cdb: One class per file"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 10 Nov 2014 19:13:07 +0000 (19:13 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 10 Nov 2014 19:13:07 +0000 (19:13 +0000)

Trivial merge