Merge "Use Parser::SFH_NO_HASH/SFH_OBJECT_ARGS class const"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 27 Nov 2014 05:55:07 +0000 (05:55 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 27 Nov 2014 05:55:07 +0000 (05:55 +0000)
1  2 
includes/Defines.php
includes/parser/Parser.php

Simple merge
Simple merge