scala/scala — pull request #2343 by retronym (2013-04-02 12:17:57+00:00)
Title: Merge 2.10.x to master

The main area of conflict was `build.xml` (refactorings/bug fixes from 2.10.x + modularization from master).

Review by @adriaanm