From: fendo <fendo@bi12info.com>
Date: Fri, 19 Sep 2014 10:20:47 +0000 (+0200)
Subject: Merge from Master
X-Git-Tag: 2.2.1-2sames3.15
X-Git-Url: http://git.sameswireless.fr/l2tpns.git/commitdiff_plain/781b0fde104ecf5f22c9c5322e58180f0b4a88a5?ds=sidebyside;hp=781b0fde104ecf5f22c9c5322e58180f0b4a88a5

Merge from Master
---