Merge "Various updates needed to bump min php version to 5.3.2"

author Tim Starling <tstarling@wikimedia.org>

Fri, 4 May 2012 12:44:57 +0000 (12:44 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Fri, 4 May 2012 12:44:57 +0000 (12:44 +0000)
author Tim Starling <tstarling@wikimedia.org>
Fri, 4 May 2012 12:44:57 +0000 (12:44 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Fri, 4 May 2012 12:44:57 +0000 (12:44 +0000)
diff --cc RELEASE-NOTES-1.20
Simple merge
diff --cc maintenance/Maintenance.php
Simple merge
author	Tim Starling <tstarling@wikimedia.org>
	Fri, 4 May 2012 12:44:57 +0000 (12:44 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Fri, 4 May 2012 12:44:57 +0000 (12:44 +0000)
		1	2
RELEASE-NOTES-1.20	patch \|	diff1 \|	diff2 \|	blob \| history
maintenance/Maintenance.php	patch \|	diff1 \|	diff2 \|	blob \| history