Merge "Whitelist the <wbr> element."

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

Wed, 7 Aug 2013 14:38:32 +0000 (14:38 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Wed, 7 Aug 2013 14:38:32 +0000 (14:38 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 7 Aug 2013 14:38:32 +0000 (14:38 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Wed, 7 Aug 2013 14:38:32 +0000 (14:38 +0000)
diff --cc RELEASE-NOTES-1.22
Simple merge
diff --cc includes/Sanitizer.php
Simple merge
diff --cc tests/parser/parserTests.txt
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Wed, 7 Aug 2013 14:38:32 +0000 (14:38 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Wed, 7 Aug 2013 14:38:32 +0000 (14:38 +0000)
		1	2
RELEASE-NOTES-1.22	patch \|	diff1 \|	diff2 \|	blob \| history
includes/Sanitizer.php	patch \|	diff1 \|	diff2 \|	blob \| history
tests/parser/parserTests.txt	patch \|	diff1 \|	diff2 \|	blob \| history