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

Conflicts:

	imap/Makefile.am

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

diff --git a/imap/Makefile.am b/imap/Makefile.am
index 0009dc5..9591604 100644 (file)
--- a/imap/Makefile.am
+++ b/imap/Makefile.am
@@ -5,7 +5,6 @@ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/intl
 noinst_LIBRARIES = libimap.a
 noinst_HEADERS = auth.h imap_private.h message.h
 
-libimap_a_SOURCES = auth.c auth_login.c browse.c command.c imap.c imap.h \
-       message.c utf7.c util.c auth_sasl.c
+libimap_a_SOURCES = auth.c auth_login.c browse.c command.c imap.c imap.h message.c utf7.c util.c auth_sasl.c
 
 -include $(top_builddir)/tools/cflags.mk