Merge "(bug 35693) ApiQueryImageInfo now suppresses errors when unserializing metadata"
authorSiebrand <siebrand@wikimedia.org>
Sun, 23 Sep 2012 18:55:37 +0000 (18:55 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sun, 23 Sep 2012 18:55:37 +0000 (18:55 +0000)

Trivial merge