Merge "Change to unix eol style"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 24 Dec 2014 12:42:57 +0000 (12:42 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 24 Dec 2014 12:42:58 +0000 (12:42 +0000)

Trivial merge