Merge commit '8571dbde639e0ee9885bad49c9e180474bd23646'
authorAndy Wingo <wingo@pobox.com>
Thu, 28 Nov 2013 14:00:17 +0000 (15:00 +0100)
committerAndy Wingo <wingo@pobox.com>
Thu, 28 Nov 2013 14:00:17 +0000 (15:00 +0100)
commitf76cf73a49e0219f81a2fa0fc8431a0b83280822
tree6ec1706097e4ec0b39fe42bc45c11f88d45171e3
parent6dd98109020997d22f78d9cd516d7809c4fcc493
parent8571dbde639e0ee9885bad49c9e180474bd23646
Merge commit '8571dbde639e0ee9885bad49c9e180474bd23646'

Conflicts:
libguile/procprop.c
libguile/async.h
libguile/threads.c
libguile/threads.h
module/Makefile.am