From: fendo <fendo@bi12info.com>
Date: Wed, 22 May 2013 19:01:18 +0000 (+0200)
Subject: Merge branch 'master' into samesversion
X-Git-Tag: 2.2.1-2sames3.9~4
X-Git-Url: http://git.sameswireless.fr/l2tpns.git/commitdiff_plain/72a615e7e39a3ea0b46d8c4d4704159fc973c60e?hp=--cc

Merge branch 'master' into samesversion
---

72a615e7e39a3ea0b46d8c4d4704159fc973c60e