Merge branch 'method-attr' into classmethod
Lukas Mai [Tue, 19 Jun 2012 03:51:39 +0000 (05:51 +0200)]

Trivial merge