Merge commit '894d0b894daae001495c748b3352cd79918d3789'
authorAndy Wingo <wingo@pobox.com>
Thu, 22 Jan 2015 13:48:40 +0000 (14:48 +0100)
committerAndy Wingo <wingo@pobox.com>
Thu, 22 Jan 2015 13:48:40 +0000 (14:48 +0100)
commitbaf90102cf39f4fdfb446df9ba8f4407b88ea794
tree7109d0c6d04c86027bc4e06895e1eea958b73ac8
parent1cd779140dd74ddfaa62032882cb4745c2302cee
parent894d0b894daae001495c748b3352cd79918d3789
Merge commit '894d0b894daae001495c748b3352cd79918d3789'

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