ensime/ensime-server — pull request #600 by fommil (2014-09-18 15:34:21+00:00)
Title: Scala 2.10

just a trivial
```
git pull -s recursive -X theirs upstream master
```
with a tiny patch to compile.