Merge "Adding new subclass to HTMLForm for constructing a checkbox matrix"

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

Tue, 5 Mar 2013 20:09:21 +0000 (20:09 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Tue, 5 Mar 2013 20:09:21 +0000 (20:09 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 5 Mar 2013 20:09:21 +0000 (20:09 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Tue, 5 Mar 2013 20:09:21 +0000 (20:09 +0000)
diff --cc RELEASE-NOTES-1.21
Simple merge
diff --cc includes/AutoLoader.php
Simple merge
diff --cc includes/User.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Tue, 5 Mar 2013 20:09:21 +0000 (20:09 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Tue, 5 Mar 2013 20:09:21 +0000 (20:09 +0000)
		1	2
RELEASE-NOTES-1.21	patch \|	diff1 \|	diff2 \|	blob \| history
includes/AutoLoader.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/User.php	patch \|	diff1 \|	diff2 \|	blob \| history