Merge remote-tracking branch 'origin/stable-2.0'
authorAndy Wingo <wingo@pobox.com>
Mon, 26 Jan 2015 17:13:38 +0000 (18:13 +0100)
committerAndy Wingo <wingo@pobox.com>
Mon, 26 Jan 2015 17:13:38 +0000 (18:13 +0100)
commit7b0a8dfb752d9d63179be944869db8447fdb7c5e
tree5a9db67c267e59f5e32dc72f32743c5333d9f4e7
parent15e4746f17207658a7b1276b4cce042a5214a9ab
parent649ec8d8234ccda55b81930a0cb07d66b4a855c6
Merge remote-tracking branch 'origin/stable-2.0'

Conflicts:
libguile/goops.c
libguile/vm-engine.h
module/oop/goops.scm
module/oop/goops/compile.scm
module/oop/goops/dispatch.scm
test-suite/tests/goops.test
module/oop/goops.scm
test-suite/tests/goops.test