Merge commit '01a301d1b606b84d986b735049e7155d2f4cd6aa'
authorAndy Wingo <wingo@pobox.com>
Thu, 22 Jan 2015 13:49:36 +0000 (14:49 +0100)
committerAndy Wingo <wingo@pobox.com>
Thu, 22 Jan 2015 13:49:36 +0000 (14:49 +0100)
commite19235e21bad6fdf8c8152dc5b460685b551f330
tree7418d69646df059651392ec11e16087cd18fb4a2
parentbaf90102cf39f4fdfb446df9ba8f4407b88ea794
parent01a301d1b606b84d986b735049e7155d2f4cd6aa
Merge commit '01a301d1b606b84d986b735049e7155d2f4cd6aa'

Conflicts:
libguile/hash.c
libguile/hash.c