Merge branch 'master' of pan:/git/madmutt
authorPierre Habouzit <madcoder@debian.org>
Sat, 12 May 2007 09:37:19 +0000 (11:37 +0200)
committerPierre Habouzit <madcoder@debian.org>
Sat, 12 May 2007 09:37:19 +0000 (11:37 +0200)
Conflicts:

imap/Makefile.am

Signed-off-by: Pierre Habouzit <madcoder@debian.org>

Trivial merge