scala/scala — pull request #1452 by gkossakowski (2012-10-03 14:39:35+00:00)
Title: Merge remote-tracking branch 'scala/2.10.x' into master

Review by @paulp.

The only interesting bit is the merge commit 9b2154e43a8a138e561a004ccab85660d3c0b4dd. I don't know how to force github ui to show merge resolution diff only but locally you can use gitk for that.