Merge branch 'stable-2.0'
authorMark H Weaver <mhw@netris.org>
Fri, 13 Dec 2013 04:44:46 +0000 (23:44 -0500)
committerMark H Weaver <mhw@netris.org>
Fri, 13 Dec 2013 04:44:46 +0000 (23:44 -0500)
commit61989c705359c50c61d7f52392f244d386218298
tree2cc726b643d3c6ce4f4d74f94b028ed98d0545a8
parente0096e479894acac139f0047eae0f89a4e6bf4c2
parent97dd74c00e40271dd4bcfefec5957bab71793066
Merge branch 'stable-2.0'

Conflicts:
libguile/pairs.c
libguile/vm.c
test-suite/tests/control.test
configure.ac
libguile/pairs.c