Merge "Made DB rollback() method properly bail out if no trx is active"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 26 Jun 2014 03:51:26 +0000 (03:51 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 26 Jun 2014 03:51:26 +0000 (03:51 +0000)
1  2 
includes/db/Database.php

Simple merge