Merge "Explicitly allow lines up to 100 chars in Rubocop"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 20 Feb 2015 12:06:29 +0000 (12:06 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 20 Feb 2015 12:06:29 +0000 (12:06 +0000)

Trivial merge