ensime/ensime-server — pull request #711 by fommil (2014-12-18 20:29:57+00:00)
Title: Scala 2.10

This is a reasonably trivial backport of master to 2.10. I'll self-merge in a moment, but I noticed something I want to do in master first.