Merge "Fix URL protocol detection regex for file link= parameter"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 18 Aug 2014 15:34:33 +0000 (15:34 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 18 Aug 2014 15:34:33 +0000 (15:34 +0000)

Trivial merge