Merge commit '750ac8c592e792e627444f476877f282525b132e'
authorAndy Wingo <wingo@pobox.com>
Thu, 28 Nov 2013 13:53:03 +0000 (14:53 +0100)
committerAndy Wingo <wingo@pobox.com>
Thu, 28 Nov 2013 13:53:03 +0000 (14:53 +0100)
commit6dd98109020997d22f78d9cd516d7809c4fcc493
tree0249ff205110f8e5a957abed5f14f2e37c32b713
parentacf7530a3ed55f15f6275f0419ef4347f8eb6f6c
parent750ac8c592e792e627444f476877f282525b132e
Merge commit '750ac8c592e792e627444f476877f282525b132e'

Conflicts:
.gitignore
libguile/deprecated.c
.gitignore
doc/ref/srfi-modules.texi
libguile/__scm.h
libguile/throw.c
module/ice-9/psyntax-pp.scm
module/ice-9/psyntax.scm