Merge "(bug 18062) new message when edit or create the local page of a shared file"

author Aaron Schulz <aschulz@wikimedia.org>

Sun, 1 Apr 2012 02:08:00 +0000 (02:08 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Sun, 1 Apr 2012 02:08:00 +0000 (02:08 +0000)
author Aaron Schulz <aschulz@wikimedia.org>
Sun, 1 Apr 2012 02:08:00 +0000 (02:08 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Sun, 1 Apr 2012 02:08:00 +0000 (02:08 +0000)
diff --cc languages/messages/MessagesEn.php
Simple merge
diff --cc maintenance/language/messages.inc
Simple merge
author	Aaron Schulz <aschulz@wikimedia.org>
	Sun, 1 Apr 2012 02:08:00 +0000 (02:08 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Sun, 1 Apr 2012 02:08:00 +0000 (02:08 +0000)
		1	2
languages/messages/MessagesEn.php	patch \|	diff1 \|	diff2 \|	blob \| history
maintenance/language/messages.inc	patch \|	diff1 \|	diff2 \|	blob \| history