Merge "Disable testIPTCParseForcedUTFButInvalid on PHP > 5.6.0 but < 5.6.10"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 11 Feb 2016 03:45:43 +0000 (03:45 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 11 Feb 2016 03:45:43 +0000 (03:45 +0000)

Trivial merge