From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Mon, 28 Sep 2015 17:23:56 +0000 (+0000)
Subject: Merge "In parserTests.php, fix upload directory handling"
X-Git-Tag: 1.31.0-rc.0~9709
X-Git-Url: http://git.cyclocoop.org//%27http:/code.google.com/p/ie7-js//%27?a=commitdiff_plain;h=bcdf83c3f9cb77560193cd31c8fb9013e80c86c8;p=lhc%2Fweb%2Fwiklou.git

Merge "In parserTests.php, fix upload directory handling"
---

bcdf83c3f9cb77560193cd31c8fb9013e80c86c8