~ chicken-core (chicken-5) 5944fbb2bc48d7f27cd117adf0e7544ad1106401


commit 5944fbb2bc48d7f27cd117adf0e7544ad1106401
Merge: c2f37304 81d9fd15
Author:     Peter Bex <peter@more-magic.net>
AuthorDate: Sun Jan 22 18:06:01 2017 +0100
Commit:     Peter Bex <peter@more-magic.net>
CommitDate: Sun Jan 22 18:06:01 2017 +0100

    Merge branch 'master' into prerelease
    
    Conflicts:
            README
            buildversion
            dbg-stub.c
            manual/Acknowledgements
            manual/The User's Manual
            tests/library-tests.scm

diff --cc buildversion
index f2fac3ea,13adf3d1..4f89fb96
--- a/buildversion
+++ b/buildversion
@@@ -1,1 -1,1 +1,1 @@@
- 4.11.0rc2
 -4.11.2
++4.11.2
Trap