scala/scala — pull request #2802 by adriaanm (2013-08-08 18:58:49+00:00)
Title: Rebase of #2711

Rebase of #2711