Merge "Remove a bunch of trailing spaces and unneeded newlines"

diff --cc includes/db/ORMTable.php
index bcbf17f,39f16a0..e3a3434
--- 1/includes/db/ORMTable.php
--- 2/includes/db/ORMTable.php
+++ b/includes/db/ORMTable.php
@@@ -350,11 -332,8 +350,11 @@@ abstract class ORMTable implements IORM
                        $conditions === array() ? '*' : $this->getPrefixedValues( $conditions ),
                        $functionName
                ) !== false; // DatabaseBase::delete does not always return true for success as documented...
 +
 +              $this->releaseConnection( $dbw );
 +              return $result;
        }
-       
+ 
        /**
         * Get API parameters for the fields supported by this object.
         *

diff --cc includes/installer/MysqlUpdater.php
Simple merge

diff --cc includes/installer/SqliteUpdater.php
Simple merge