From: fendo <fendo@bi12info.com>
Date: Tue, 4 Jun 2013 12:39:00 +0000 (+0200)
Subject: Merge from master
X-Git-Tag: 2.2.1-2sames3.10
X-Git-Url: http://git.sameswireless.fr/l2tpns.git/commitdiff_plain/f6b5140de23dd17f9a9c28fcca0fcef58b161a78?hp=f6b5140de23dd17f9a9c28fcca0fcef58b161a78

Merge from master
---