Merge "(bug 47070) check content model namespace on import."

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

Tue, 28 Jan 2014 20:56:02 +0000 (20:56 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Tue, 28 Jan 2014 20:56:02 +0000 (20:56 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 28 Jan 2014 20:56:02 +0000 (20:56 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Tue, 28 Jan 2014 20:56:02 +0000 (20:56 +0000)
diff --cc docs/hooks.txt
Simple merge
diff --cc includes/Import.php
Simple merge
diff --cc languages/messages/MessagesEn.php
Simple merge
diff --cc languages/messages/MessagesQqq.php
Simple merge
diff --cc maintenance/language/messages.inc
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Tue, 28 Jan 2014 20:56:02 +0000 (20:56 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Tue, 28 Jan 2014 20:56:02 +0000 (20:56 +0000)
		1	2
docs/hooks.txt	patch \|	diff1 \|	diff2 \|	blob \| history
includes/Import.php	patch \|	diff1 \|	diff2 \|	blob \| history
languages/messages/MessagesEn.php	patch \|	diff1 \|	diff2 \|	blob \| history
languages/messages/MessagesQqq.php	patch \|	diff1 \|	diff2 \|	blob \| history
maintenance/language/messages.inc	patch \|	diff1 \|	diff2 \|	blob \| history