Merge branch 'stricter-chained-arg-attrs' into SicilianButtercup
Dagfinn Ilmari Mannsåker [Mon, 13 May 2013 20:51:11 +0000 (21:51 +0100)]

Trivial merge