Merge remote-tracking branch 'origin/stable-2.0'
authorMark H Weaver <mhw@netris.org>
Tue, 6 Aug 2013 21:37:34 +0000 (17:37 -0400)
committerMark H Weaver <mhw@netris.org>
Tue, 6 Aug 2013 21:37:34 +0000 (17:37 -0400)
commitd8d7c7bf5706ce7873257eb88f0a5cc01b541858
tree406fa16e28f45c93b361d2f8ea80a62374dd180a
parente7f64971ed62a6b58f86b5d90a15b24733e36a8d
parent524140436fc03ee439d5c358c8c7a4c2c559684a
Merge remote-tracking branch 'origin/stable-2.0'

Conflicts:
libguile/numbers.c
libguile/vm-i-scheme.c
libguile/numbers.c
libguile/vm-i-scheme.c
m4/gnulib-cache.m4