~ chicken-core (chicken-5) 90e3488b7ba61b0aa38ec136a24004bdedfa16ac


commit 90e3488b7ba61b0aa38ec136a24004bdedfa16ac
Merge: ce980c43 40230757
Author:     Peter Bex <peter@more-magic.net>
AuthorDate: Sun Feb 19 12:44:21 2017 +0100
Commit:     Peter Bex <peter@more-magic.net>
CommitDate: Sun Feb 19 12:44:21 2017 +0100

    Merge branch 'prerelease' into release
    
    Conflicts:
            README
            buildversion
            manual/The User's Manual

Trap