Merge from Master

diff --cc cluster.c
Simple merge

diff --cc cluster.h
index 290c589,29da274..3df6c4d
--- 1/cluster.h
--- 2/cluster.h
+++ b/cluster.h
@@@ -25,11 -25,8 +25,11 @@@
  #define C_CBUNDLE             18      // Compressed bundle structure.
  #define C_MPPP_FORWARD        19      // MPPP Forwarded packet..
  #define C_PPPOE_FORWARD       20      // PPPOE Forwarded packet..
 +#define C_GROUPE              21      // Groupe structure.
 +#define C_CGROUPE             22      // Compressed groupe structure.
 +
  
- #define HB_VERSION            8       // Protocol version number..
+ #define HB_VERSION            9       // Protocol version number..
  #define HB_MAX_SEQ            (1<<30) // Maximum sequence number. (MUST BE A POWER OF 2!)
  #define HB_HISTORY_SIZE               64      // How many old heartbeats we remember?? (Must be a factor of HB_MAX_SEQ)
  

diff --cc debian/changelog
index 1c96e14,2d7eaed..14b5b52
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,31 +1,21 @@@
 -l2tpns (2.2.1-2fdn3.15) unstable; urgency=low
++l2tpns (2.2.1-2sames3.15) unstable; urgency=low
+ 
+   * new feature: If the user attribute "Framed-IPv6-Address" is defined then the ICMPv6_RA advertise this IPv6 address.
+   * Fix: Incorrect delegation of IPv6 prefixes when multiple of 4 bits (nibble) (eg: /44, /52 ...).
+   * Added ability to define up to 5 IPv6 prefix delegation by user.
+ 
+  -- Fernando Alves <fendo@sameswifi.fr>  Thu, 18 Sep 2014 18:36:43 +0200
+ 
 -l2tpns (2.2.1-2fdn3.14) unstable; urgency=low
 +l2tpns (2.2.1-2sames3.14) unstable; urgency=low
  
    * Fix cluster slave; reset to 0, the end of the session when the master version < slave version.
    * Fix cluster slave; no add the ipv6 route address (/128) if included in the delegated prefix.
 -
 - -- Fernando Alves <fendo@sameswifi.fr>  Fri, 12 Sep 2014 18:21:53 +0200
 -
 -l2tpns (2.2.1-2fdn3.13) unstable; urgency=low
 -
    * Add DHCPv6 functionality
 -
 - -- Fernando Alves <fendo@sameswifi.fr>  Thu, 11 Sep 2014 16:10:38 +0200
 -
 -l2tpns (2.2.1-2fdn3.12) unstable; urgency=low
 -
    * Fix: remove old IPV6 routes on master
  
 - -- Fernando Alves <fendo@sameswifi.fr>  Tue, 10 Dec 2013 23:13:20 +0100
 + -- Fernando Alves <fendo@sameswifi.fr>  Sun, 14 Sep 2014 18:27:09 +0200
  
- l2tpns (2.2.1-2sames3.12) UNRELEASED; urgency=low
 -l2tpns (2.2.1-2fdn3.11) unstable; urgency=low
++l2tpns (2.2.1-2sames3.12) unstable; urgency=low
  
    * Fix: throttle ipv6 out.
    * Fix: remove old IPV6 routes on slave

diff --cc icmp.c
Simple merge

diff --cc l2tpns.c
Simple merge

diff --cc l2tpns.h
Simple merge

diff --cc ppp.c
Simple merge

diff --cc radius.c
Simple merge