Merge "Skip IPTCTest::testIPTCParseForcedUTFButInvalid() on pre-PHP5.5.26"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 26 Jan 2016 20:36:46 +0000 (20:36 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 26 Jan 2016 20:36:46 +0000 (20:36 +0000)

Trivial merge