Merge commit '1e3fd6a0c81bb3e9900a93a9d1923cc788de0f99'
authorAndy Wingo <wingo@pobox.com>
Fri, 7 Feb 2014 14:27:28 +0000 (15:27 +0100)
committerAndy Wingo <wingo@pobox.com>
Fri, 7 Feb 2014 14:27:28 +0000 (15:27 +0100)
commitcc620af7ca9bb7c2c841f9612fbdf97b68aaf277
tree1b72380e3af361d56f9e629d903393d4824b21db
parent7affd3141b4f821fba911caa7a94d9cc9c03fafe
parent1e3fd6a0c81bb3e9900a93a9d1923cc788de0f99
Merge commit '1e3fd6a0c81bb3e9900a93a9d1923cc788de0f99'

Conflicts:
doc/ref/api-memory.texi
libguile/weaks.c
libguile/weaks.h
module/ice-9/weak-vector.scm
doc/ref/api-memory.texi