[balsa] Release balsa-2.4.12.

[Pawel Salek <pawels src gnome org>]

commit 38db0dfa89b9d2753b356efad784436005858b58
Author: Pawel Salek <pawsa0 gmail com>
Date:   Fri Apr 20 21:22:48 2012 +0200

    Release balsa-2.4.12.

 ChangeLog    |    7 ++++---
 Makefile.am  |    2 +-
 configure.in |    2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 7011644..c856cab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
-<<<<<<< HEAD
-=======
+2012-04-21  Pawel Salek
+
+	* NEWS, configure.in: release balsa-2.4.12
+
 2012-02-08  Albrecht DreÃ
 
 	* libbalsa/gmime-part-rfc2440.c (g_mime_part_rfc2440_verify):
@@ -21,7 +23,6 @@
 
 	* .gitignore: add .libs.
 
->>>>>>> 971d850... Check for empty return from GpgME
 2011-12-20  Albrecht DreÃ
 
 	* libbalsa/rfc3156.c: suppress GLib warning when the message is
diff --git a/Makefile.am b/Makefile.am
index 484ecf0..63c27d0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 #intl dir needed for tarball --disable-nls build.
-DISTCHECK_CONFIGURE_FLAGS="--disable-extra-mimeicons"
+DISTCHECK_CONFIGURE_FLAGS=--disable-extra-mimeicons --without-gnome --without-html-widget
 SUBDIRS = po sounds images doc libbalsa libinit_balsa src
 # set tar in case it is not set by automake or make
 
diff --git a/configure.in b/configure.in
index e9a4a6a..d216639 100644
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ dnl ###########################################################################
 dnl Boilerplace and versioning
 dnl ###########################################################################
 
-AC_INIT([balsa], [2.4.11], [])
+AC_INIT([balsa], [2.4.12], [])
 AM_INIT_AUTOMAKE
 AC_LANG([C])
 # Automake-1.11 option for less verbose output