Merge "Move DEADLOCK_* constants into DatabaseBase"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 6 May 2013 18:16:23 +0000 (18:16 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 6 May 2013 18:16:23 +0000 (18:16 +0000)

Trivial merge