~ chicken-core (chicken-5) 775df1077cc06d000d873054cb8cc2b549ac263f


commit 775df1077cc06d000d873054cb8cc2b549ac263f
Merge: 96a2bbff e42caebc
Author:     Moritz Heidkamp <moritz@twoticketsplease.de>
AuthorDate: Fri Apr 4 21:05:57 2014 +0200
Commit:     Moritz Heidkamp <moritz@twoticketsplease.de>
CommitDate: Fri Apr 4 21:05:57 2014 +0200

    Merge remote-tracking branch 'origin/master' into prerelease

Trap