Merge "Increase permitted runtime for testParserTest"
authorBrion VIBBER <brion@wikimedia.org>
Fri, 20 Apr 2012 18:03:20 +0000 (18:03 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 20 Apr 2012 18:03:20 +0000 (18:03 +0000)

Trivial merge