Merge remote-tracking branch 'upstream/master' into upstream

[pkg/abook.git] / AUTHORS

diff --git a/AUTHORS b/AUTHORS
index 7ead74f29339bda1b9b70b045c5548dacd39cc25..e906315fdaf90a60a301360828a8854d6b8b55c2 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -3,6 +3,11 @@ abook AUTHORS
 
 Jaakko Heinonen                <jheinonen@users.sourceforge.net>
 
+Cedric Duval           <cedricduval@free.fr>
+ - views
+ - i18n
+ - etc.
+
 Alan Ford              <alan@whirlnet.co.uk>
  - Debian package
  - manual pages
@@ -21,6 +26,21 @@ Koenraad Heijlen     <vipie@ulyssis.org>
  - palmcsv export filter
  - fixes
 
-Cedric Duval           <cedricduval@free.fr>
- - i18n
+Michael Krolikowski    <mkroli@yahoo.de>
+ - built-in vcard import filter
+
+Raphaël Droz          <raphael.droz+floss@gmail.com>
+ - custom output format
+ - reworked ldif input/output
+ - vcard import filter through libvformat
+ - fixes
 
+Thorsten Wißmann      <edu@thorsten-wissmann.de>
+ - color support
+ - mouse support
+
+Fabio Zanini           <fabio.zanini@fastmail.fm>
+ - merge entries
+ - duplicated entries removal
+ - mutt "groups"
+ - fixes