Merge commit '2f3b7e9a41677bfe802e8a1ee851827297384c58'
authorAndy Wingo <wingo@pobox.com>
Sat, 8 Feb 2014 13:44:11 +0000 (14:44 +0100)
committerAndy Wingo <wingo@pobox.com>
Sat, 8 Feb 2014 13:44:11 +0000 (14:44 +0100)
commit5fc051babef5ea07cf48c02c31ef729344639f9a
tree7a4387c806236e7defdc7c8dd98f5c28c40da3ae
parent730639e9a7bca966c6e884ec47b3166544767f2f
parent2f3b7e9a41677bfe802e8a1ee851827297384c58
Merge commit '2f3b7e9a41677bfe802e8a1ee851827297384c58'

Conflicts:
module/ice-9/pretty-print.scm
module/ice-9/pretty-print.scm