~ chicken-core (chicken-5) 2f96b84bc8a36af461172997e51ebc94bef1eb7a

commit 2f96b84bc8a36af461172997e51ebc94bef1eb7a
Merge: 50ee93d8 729febc0
Author:     Christian Kellermann <ckeen@pestilenz.org>
AuthorDate: Thu Sep 11 15:01:05 2014 +0200
Commit:     Christian Kellermann <ckeen@pestilenz.org>
CommitDate: Thu Sep 11 15:01:05 2014 +0200

    Merge branch 'master' into chicken-5
    
    This should ease further development on this branch.
    This potentially will become the new master branch after
    a final 4.x release.
    
    Signed-off-by: Christian Kellermann <ckeen@pestilenz.org>
    
    Conflicts:
            scrutinizer.scm

diff --cc scrutinizer.scm
index 63f0296f,fc88438a..721aa055
--- a/scrutinizer.scm
+++ b/scrutinizer.scm
@@@ -2349,4 -2280,3 +2276,4 @@@
  	    (else 
  	     (restore)
  	     (loop (cdr ts) ok))))))
- )
++)