scala/scala — pull request #2180 by adriaanm (2013-02-27 23:25:45+00:00)
Title: Merge 2.10.1 into master

The [nomaster] commits have been merged with git merge -s ours.