scala/scala — pull request #2151 by adriaanm (2013-02-21 06:49:28+00:00)
Title: Merge 2.10.x into master

review by @paulp