~ chicken-core (chicken-5) 5c310bbcecf949140b636979b4b01c9793eb0ba6

commit 5c310bbcecf949140b636979b4b01c9793eb0ba6
Author:     Peter Bex <peter@more-magic.net>
AuthorDate: Sun Sep 11 22:17:45 2016 +0200
Commit:     Peter Bex <peter@more-magic.net>
CommitDate: Sun Sep 11 22:20:00 2016 +0200

    Merge bumping of version to 4.11.2 into NEWS and such
    
    Conflicts:
            NEWS
            README
            buildversion
            manual/The User's Manual

diff --git a/NEWS b/NEWS
index b6bd4715..c7210dd5 100644
--- a/NEWS
+++ b/NEWS
@@ -53,6 +53,9 @@
   - Removed support for (define-syntax (foo e r c) ...), which was
     undocumented and not officially supported anyway.
 
+4.11.2
+
+
 4.11.1
 
 - Security fixes
diff --git a/README b/README
index eaf9f932..1ff7433d 100644
--- a/README
+++ b/README
@@ -6,7 +6,11 @@
   (c) 2008-2015, The CHICKEN Team
   (c) 2000-2007, Felix L. Winkelmann
 
+<<<<<<< HEAD
   version 4.9.1
+=======
+  version 4.11.2
+>>>>>>> 0012ce0... Bump version to 4.11.2
 
 
  1. Introduction
diff --git a/buildversion b/buildversion
index 28cbf7c0..0062ac97 100644
--- a/buildversion
+++ b/buildversion
@@ -1 +1 @@
-5.0.0
\ No newline at end of file
+5.0.0
diff --git a/manual/The User's Manual b/manual/The User's Manual
index 65629e5d..99daa289 100644
--- a/manual/The User's Manual	
+++ b/manual/The User's Manual	
@@ -6,7 +6,7 @@
 <img id="big-logo" style="float:right; margin-left:1em;" src="http://wiki.call-cc.org/chicken-small.png" alt="Stylized picture of a chicken"/>
 </nowiki>
 
-This is the manual for CHICKEN Scheme, version 4.9.1
+This is the manual for CHICKEN Scheme, version 5.0.0
 
 ; [[Getting started]] : What is CHICKEN and how do I use it?