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)
commit6cc64ac1d90eed0c8280c3f7b4c2ab514d5224d1
treed973056d0559124f9e63ab3a62899e437d0df4dc
parent8e689b28eefc1a93797f299c33f7ec3e2e340329
parent55a276b42d6e3fa25bb4f8debf91bb97ad37ce33
Merge branch 'master' of pan:/git/madmutt

Conflicts:

imap/Makefile.am

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