Code

Merge remote-tracking branch 'anarcat/autogen'
authorFlorian Forster <octo@verplant.org>
Tue, 3 Dec 2013 14:33:18 +0000 (15:33 +0100)
committerFlorian Forster <octo@verplant.org>
Tue, 3 Dec 2013 14:33:18 +0000 (15:33 +0100)

Trivial merge