Solved cvs conflict
authorWerner Koch <wk@gnupg.org>
Thu, 27 Nov 2003 13:55:24 +0000 (13:55 +0000)
committerWerner Koch <wk@gnupg.org>
Thu, 27 Nov 2003 13:55:24 +0000 (13:55 +0000)
commit20d83b24eefd8e9b23d89aecafc0e3fd2229a9a0
tree0bb53f74db674f5b41854e39545d6a961fa9e7fc
parentc257783793276b670c9f46f2c784b51d6314e48d
Solved cvs conflict
doc/ChangeLog
doc/DETAILS