Merge "Bump grunt to 1.0.1, remove grunt-cli"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 12 Apr 2016 22:52:21 +0000 (22:52 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 12 Apr 2016 22:52:21 +0000 (22:52 +0000)

Trivial merge