Merge remote-tracking branch 'origin/stable-2.0'
authorAndy Wingo <wingo@pobox.com>
Thu, 3 Oct 2013 19:35:21 +0000 (21:35 +0200)
committerAndy Wingo <wingo@pobox.com>
Thu, 3 Oct 2013 19:35:21 +0000 (21:35 +0200)
commitd7928d7c61f297dca574e20bb5815253e90b3a36
treef8b4ac0103eaded5c3b61573212ab0dc5fd5fcd1
parentae07b8e70bfc53220d7017bb7edcdb6c329d5bd5
parentd7794a9d07ba657a29f7e608c3e558c437806def
Merge remote-tracking branch 'origin/stable-2.0'

Conflicts:
libguile/deprecated.h
libguile/programs.c
libguile/programs.h
libguile/numbers.c
libguile/programs.c
libguile/programs.h