Merge "Add GetContentModels hook to allow extensions to enumerate dynamic content...
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 8 Feb 2017 08:55:57 +0000 (08:55 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 8 Feb 2017 08:55:58 +0000 (08:55 +0000)

Trivial merge