Merge "Allow aliased field names with separated syntax"

author Catrope <roan.kattouw@gmail.com>

Wed, 15 Aug 2012 18:01:18 +0000 (18:01 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Wed, 15 Aug 2012 18:01:18 +0000 (18:01 +0000)
author Catrope <roan.kattouw@gmail.com>
Wed, 15 Aug 2012 18:01:18 +0000 (18:01 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Wed, 15 Aug 2012 18:01:18 +0000 (18:01 +0000)
diff --cc includes/api/ApiQueryTags.php
Simple merge
diff --cc includes/specials/SpecialUndelete.php
Simple merge
author	Catrope <roan.kattouw@gmail.com>
	Wed, 15 Aug 2012 18:01:18 +0000 (18:01 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Wed, 15 Aug 2012 18:01:18 +0000 (18:01 +0000)
		1	2
includes/api/ApiQueryTags.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/specials/SpecialUndelete.php	patch \|	diff1 \|	diff2 \|	blob \| history