Merge "Avoid invidual LinkCache lookups in Linker::makeBrokenImageLinkObj()"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 24 May 2016 03:29:28 +0000 (03:29 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 24 May 2016 03:29:28 +0000 (03:29 +0000)
1  2 
includes/Linker.php
tests/parser/parserTests.txt

Simple merge
Simple merge