Merge "Parser: Better debugging of lock errors ("Did you call Parser::parse recursive...
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 30 May 2017 19:01:45 +0000 (19:01 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 30 May 2017 19:01:45 +0000 (19:01 +0000)
1  2 
includes/parser/Parser.php

Simple merge