Merge commit 'b86069c1308a6ca36f3a3bc56134b3f8fd693592'
authorAndy Wingo <wingo@pobox.com>
Sat, 8 Feb 2014 13:46:31 +0000 (14:46 +0100)
committerAndy Wingo <wingo@pobox.com>
Sat, 8 Feb 2014 13:46:31 +0000 (14:46 +0100)
commit04023cceb7584810005906b86c876d703a0e98b5
tree3edbe0258ecde21b98707123150100cb881cea85
parentd4a5776ac5fd39fc65100d626ca3c147ca3dc2c2
parentb86069c1308a6ca36f3a3bc56134b3f8fd693592
Merge commit 'b86069c1308a6ca36f3a3bc56134b3f8fd693592'

Conflicts:
libguile/hashtab.c
doc/ref/api-memory.texi
libguile/weak-table.c