Merge "(bug 14237) Allow PAGESINCATEGORY to distinguish between 'all', 'pages', ...

author Catrope <roan.kattouw@gmail.com>

Thu, 26 Jul 2012 02:11:05 +0000 (02:11 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Thu, 26 Jul 2012 02:11:05 +0000 (02:11 +0000)
author Catrope <roan.kattouw@gmail.com>
Thu, 26 Jul 2012 02:11:05 +0000 (02:11 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Thu, 26 Jul 2012 02:11:05 +0000 (02:11 +0000)
diff --cc RELEASE-NOTES-1.20
Simple merge
diff --cc includes/parser/CoreParserFunctions.php
Simple merge
author	Catrope <roan.kattouw@gmail.com>
	Thu, 26 Jul 2012 02:11:05 +0000 (02:11 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Thu, 26 Jul 2012 02:11:05 +0000 (02:11 +0000)
		1	2
RELEASE-NOTES-1.20	patch \|	diff1 \|	diff2 \|	blob \| history
includes/parser/CoreParserFunctions.php	patch \|	diff1 \|	diff2 \|	blob \| history