Merge branch 'master' into guile-meta
commit27916d2da2e43f231daff12249b19701f5a27b4f
authorJose Antonio Ortega Ruiz <jao@gnu.org>
Tue, 9 Nov 2010 20:52:56 +0000 (9 21:52 +0100)
committerJose Antonio Ortega Ruiz <jao@gnu.org>
Tue, 9 Nov 2010 20:52:56 +0000 (9 21:52 +0100)
tree8425627764ba5a195a25665da5a2c62ce2f221bd
parentd830e14a4010284b4085d9942bfd856b0360d793
parentf2bf4b2cda05fe8c32ee74ce3b5cce743d81de61
Merge branch 'master' into guile-meta

Conflicts:
elisp/geiser-guile.el
elisp/geiser-guile.el