From: Pierre Habouzit <madcoder@debian.org>
Date: Sat, 12 May 2007 09:37:19 +0000 (+0200)
Subject: Merge branch 'master' of pan:/git/madmutt
X-Git-Url: http://git.madism.org/?a=commitdiff_plain;h=6cc64ac1d90eed0c8280c3f7b4c2ab514d5224d1;p=apps%2Fmadmutt.git

Merge branch 'master' of pan:/git/madmutt

Conflicts:

	imap/Makefile.am

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

6cc64ac1d90eed0c8280c3f7b4c2ab514d5224d1