Merge "GallerySlideshow: Always set image height, adjust according to caption size"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 23 Feb 2017 02:51:53 +0000 (02:51 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 23 Feb 2017 02:51:53 +0000 (02:51 +0000)

Trivial merge