Merge "wikibits: Un-deprecate importScript and importStylesheet"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 23 Apr 2015 16:13:30 +0000 (16:13 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 23 Apr 2015 16:13:30 +0000 (16:13 +0000)

Trivial merge