From: fendo <fendo@bi12info.com>
Date: Tue, 21 May 2013 09:54:43 +0000 (+0200)
Subject: Merge from master
X-Git-Tag: 2.2.1-2sames3.9~7
X-Git-Url: http://git.sameswireless.fr/l2tpns.git/commitdiff_plain/59e6083b5ecbb2a8e9ab511ac2f8da40b5c82f66?hp=59e6083b5ecbb2a8e9ab511ac2f8da40b5c82f66

Merge from master
---