~ chicken-core (chicken-5) 81e44df8f30035d94c66e3b74c560454c195197d

commit 81e44df8f30035d94c66e3b74c560454c195197d
Merge: 3f195ba7 24763042
Author:     Peter Bex <peter@more-magic.net>
AuthorDate: Tue Aug 4 20:46:53 2015 +0200
Commit:     Peter Bex <peter@more-magic.net>
CommitDate: Tue Aug 4 20:46:53 2015 +0200

    Merge branch 'prerelease' into release
    
    Conflicts:
            buildversion