Merge "Allow setting default thumb size in parser tests"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 20 Mar 2014 17:58:56 +0000 (17:58 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 20 Mar 2014 17:58:56 +0000 (17:58 +0000)
1  2 
tests/parser/parserTest.inc
tests/parser/parserTests.txt

Simple merge
Simple merge