Merge "Use WikiPage::makeParserOptions() where possible."

author Aaron Schulz <aschulz@wikimedia.org>

Sun, 16 Sep 2012 18:02:56 +0000 (18:02 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Sun, 16 Sep 2012 18:02:56 +0000 (18:02 +0000)
author Aaron Schulz <aschulz@wikimedia.org>
Sun, 16 Sep 2012 18:02:56 +0000 (18:02 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Sun, 16 Sep 2012 18:02:56 +0000 (18:02 +0000)
diff --cc includes/Article.php
Simple merge
diff --cc includes/EditPage.php
Simple merge
diff --cc includes/WikiPage.php
Simple merge
author	Aaron Schulz <aschulz@wikimedia.org>
	Sun, 16 Sep 2012 18:02:56 +0000 (18:02 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Sun, 16 Sep 2012 18:02:56 +0000 (18:02 +0000)
		1	2
includes/Article.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/EditPage.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/WikiPage.php	patch \|	diff1 \|	diff2 \|	blob \| history