Merge "Use $wgExpensiveParserFunctionLimit over ParserOptions"
authorAaron Schulz <aschulz@wikimedia.org>
Sat, 5 May 2012 09:32:28 +0000 (09:32 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sat, 5 May 2012 09:32:28 +0000 (09:32 +0000)
1  2 
includes/parser/Parser.php

Simple merge