Merge branch 'master' into py-generator
authorEmilien Kenler <hello@emilienkenler.com>
Sun, 18 Aug 2013 09:12:38 +0000 (11:12 +0200)
committerEmilien Kenler <hello@emilienkenler.com>
Sun, 18 Aug 2013 09:12:38 +0000 (11:12 +0200)

Trivial merge