Merge "HTMLForm entity labels are now optional and escaped"

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

Wed, 1 May 2013 01:02:06 +0000 (01:02 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Wed, 1 May 2013 01:02:06 +0000 (01:02 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 1 May 2013 01:02:06 +0000 (01:02 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Wed, 1 May 2013 01:02:06 +0000 (01:02 +0000)
diff --cc includes/HTMLForm.php
Simple merge
diff --cc includes/Preferences.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Wed, 1 May 2013 01:02:06 +0000 (01:02 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Wed, 1 May 2013 01:02:06 +0000 (01:02 +0000)
		1	2
includes/HTMLForm.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/Preferences.php	patch \|	diff1 \|	diff2 \|	blob \| history