Merge "Check result of preg_match_all in Parser.php"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 2 Jun 2015 22:08:42 +0000 (22:08 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 2 Jun 2015 22:08:42 +0000 (22:08 +0000)
1  2 
includes/parser/Parser.php

Simple merge