From: fendo <fendo@bi12info.com>
Date: Wed, 24 Apr 2013 20:42:38 +0000 (+0200)
Subject: Merge branch 'master' into samesversion
X-Git-Tag: 2.2.1-2sames3.8~2
X-Git-Url: http://git.sameswireless.fr/l2tpns.git/commitdiff_plain/12835e031e502885bce44c5e6b59fa12e0564ca0?hp=12835e031e502885bce44c5e6b59fa12e0564ca0

Merge branch 'master' into samesversion
---