scala/scala — pull request #2242 by adriaanm (2013-03-13 00:44:01+00:00)
Title: Merge 2.10.x into master

review by @retronym