From: fendo <fendo@bi12info.com>
Date: Mon, 7 Oct 2013 20:49:53 +0000 (+0200)
Subject: Merge from master
X-Git-Tag: 2.2.1-2sames3.12
X-Git-Url: http://git.sameswireless.fr/l2tpns.git/commitdiff_plain/30b561eb71683b52894abacf0a607d7d6932e4c1?hp=30b561eb71683b52894abacf0a607d7d6932e4c1

Merge from master
---