From e51c72f1e85d3f2e6f89f62ed409a985e0d34397 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 4 Mar 2013 00:10:09 +0100
Subject: [PATCH] Merge

---
 ChangeLog              | 10 ++++++++++
 build/debian/changelog |  4 ++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 677d1610a5d..b71e3c6026a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -38,6 +38,16 @@ For translators:
 
 
 
+***** ChangeLog for 3.3.1 compared to 3.3 *****
+
+- Fix: [ bug #733 ] Mass emailing tools do not support <style HTML tag
+- Fix: Package for launchpad
+- Fix: [ bug #736 ] Missing column in llx_c_chargesociales  
+- Fix: Localtax2 for Spain must be based into buyer
+
+
+
+
 ***** ChangeLog for 3.3.1 compared to 3.3 *****
 
 - Fix: [ bug #733 ] Mass emailing tools do not support <style HTML tag
diff --git a/build/debian/changelog b/build/debian/changelog
index 4380b0a6b50..8a995f9f778 100644
--- a/build/debian/changelog
+++ b/build/debian/changelog
@@ -4,6 +4,6 @@ dolibarr (3.4.0+nmu1) unstable; urgency=low
   * New upstream release.
     closes: bug#634783
     
- -- Dolibarr team <contact@dolibarr.org>  Thu, 28 Feb 2013 12:00:00 +0100     
+ -- Dolibarr team <contact@dolibarr.org>  Sat, 2 Mar 2013 12:00:00 +0100     
 
-# For a changelog file dedicated to end users, see /usr/share/doc/dolibarr/ChangeLog.gz 
\ No newline at end of file
+# For a changelog file dedicated to end users, see /usr/share/doc/dolibarr/ChangeLog.gz