From: fendo <fendo@bi12info.com>
Date: Sun, 14 Sep 2014 17:00:57 +0000 (+0200)
Subject: Merge from Master
X-Git-Tag: 2.2.1-2sames3.14
X-Git-Url: http://git.sameswireless.fr/l2tpns.git/commitdiff_plain/ba1c3362c6dc0d65eb3d06368c47b75aa135456b?hp=ba1c3362c6dc0d65eb3d06368c47b75aa135456b

Merge from Master
---