Merge branch 'master' into samesversion

[l2tpns.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 3fa3789..5c63054 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,17 +1,17 @@
-l2tpns (2.2.1-2fdn3.7) unstable; urgency=low
-
-  * Adding the possibility to listening multiple IP L2TP Tunnels
-  * Removing LAC flag.
-
- -- Fernando Alves <fernando.alves@sameswireless.fr>  Thu, 28 Mar 2013 10:50:00 +0100
-
-l2tpns (2.2.1-2fdn3.6) unstable; urgency=low
+l2tpns (2.2.1-2sames3.7) unstable; urgency=low
 
+  * Merge from master
   * Fix Warning: dereferencing type-punned pointer will break strict...
   * Fix: Tunnel creation does not work when the length of the hostname is odd. (revert fix: Add a uint16_t control buffer type, as a union)
 
  -- Fernando Alves <fernando.alves@sameswireless.fr>  Tue, 26 Feb 2013 09:07:16 +0100
 
+l2tpns (2.2.1-2sames3.6) unstable; urgency=low
+
+  * Sames l2tpns version.
+
+ -- Fernando Alves <fernando.alves@sameswireless.fr>  Tue, 12 Feb 2013 20:20:17 +0100
+
 l2tpns (2.2.1-2fdn3.5) unstable; urgency=low
 
   * Update debian/changelog