Merge "XMP: log structured data for halting errors"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 27 Aug 2015 21:10:22 +0000 (21:10 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 27 Aug 2015 21:10:22 +0000 (21:10 +0000)

Trivial merge