Merge commit '5d971db802eaa8038db17e1aa5b4c69452739744'
authorAndy Wingo <wingo@pobox.com>
Thu, 22 Jan 2015 12:34:48 +0000 (13:34 +0100)
committerAndy Wingo <wingo@pobox.com>
Thu, 22 Jan 2015 12:34:48 +0000 (13:34 +0100)
commit2f5c5d09a069b3e967bef815e041d1bab854a2e5
tree51d7ff39e18a07833d7ed112143756d2d3d2e6fe
parent1fc3fc11ffea3b5c0b1844306244b3f4a52c1067
parent5d971db802eaa8038db17e1aa5b4c69452739744
Merge commit '5d971db802eaa8038db17e1aa5b4c69452739744'

Conflicts:
libguile/ports.c