Merge "mediawiki.Upload.BookletLayout: If the user can't upload, don't show them...
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 22 Oct 2015 21:10:38 +0000 (21:10 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 22 Oct 2015 21:10:38 +0000 (21:10 +0000)

Trivial merge