Merge branch 'fix-plain-links'
commitc03d64ceb2cfa48977043778e12750c574d6b93f
authorCarsten Dominik <carsten.dominik@gmail.com>
Tue, 25 Aug 2009 09:13:27 +0000 (25 11:13 +0200)
committerCarsten Dominik <carsten.dominik@gmail.com>
Tue, 25 Aug 2009 09:13:27 +0000 (25 11:13 +0200)
tree12b6317f1e0b72b84cdbff52d50ceafde8cf7c5c
parent1c8b0c3b41710953d8a16ac3714480ba0f5dee70
parent0b0460703a69e47ef7e86741316f484febe2f5f3
Merge branch 'fix-plain-links'

Conflicts:
lisp/ChangeLog
lisp/ChangeLog