Merge "Deprecate Database::getProperty()"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 18 Oct 2016 23:36:47 +0000 (23:36 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 18 Oct 2016 23:36:47 +0000 (23:36 +0000)

Trivial merge