Merge "media: Fix casing of IPTC::parse() in tests"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 29 Feb 2016 23:32:00 +0000 (23:32 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 29 Feb 2016 23:32:00 +0000 (23:32 +0000)

Trivial merge