Merge "Sanitize thumbnails and captions styles"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 19 Aug 2014 23:50:19 +0000 (23:50 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 19 Aug 2014 23:50:19 +0000 (23:50 +0000)

Trivial merge