Merge branch 'devel' of git://repo.or.cz/ebib into devel
commit1bda8fffab91860fed7e1b7d1713d1ceb02f83c4
authorJoost Kremers <joostkremers@yahoo.com>
Sun, 29 Jun 2008 21:08:15 +0000 (29 23:08 +0200)
committerJoost Kremers <joostkremers@yahoo.com>
Sun, 29 Jun 2008 21:08:15 +0000 (29 23:08 +0200)
tree68dee0d5f0bfc40b1c567589168fa6f47a7c146a
parent10af2533b74528072e661805feca9c5faa4f0fcf
parentffec4f98b123440b7056253c47b9b6ad301db189
Merge branch 'devel' of git://repo.or.cz/ebib into devel

Conflicts:

src/ChangeLog
src/ChangeLog
src/ebib.el