Merge "Always decode Blob objects from Database::addQuotes"

author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>

Wed, 25 Feb 2015 21:17:06 +0000 (21:17 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Wed, 25 Feb 2015 21:17:06 +0000 (21:17 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 25 Feb 2015 21:17:06 +0000 (21:17 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Wed, 25 Feb 2015 21:17:06 +0000 (21:17 +0000)
diff --cc autoload.php
Simple merge
diff --cc includes/db/Database.php
Simple merge
diff --cc includes/db/DatabaseMssql.php
Simple merge
diff --cc includes/db/DatabasePostgres.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Wed, 25 Feb 2015 21:17:06 +0000 (21:17 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Wed, 25 Feb 2015 21:17:06 +0000 (21:17 +0000)
		1	2
autoload.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/db/Database.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/db/DatabaseMssql.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/db/DatabasePostgres.php	patch \|	diff1 \|	diff2 \|	blob \| history