From: fendo <fendo@bi12info.com>
Date: Tue, 12 Nov 2013 21:38:40 +0000 (+0100)
Subject: Merge from master
X-Git-Tag: 2.2.1-2sames3.14~1
X-Git-Url: http://git.sameswireless.fr/l2tpns.git/commitdiff_plain/dac7fe82bb8d933fb3a68cb9c0256dac6f4470ae?hp=dac7fe82bb8d933fb3a68cb9c0256dac6f4470ae

Merge from master
---