From: fendo <fendo@bi12info.com>
Date: Mon, 29 Apr 2013 16:32:06 +0000 (+0200)
Subject: Merge branch 'master' into samesversion
X-Git-Tag: 2.2.1-2sames3.8~1
X-Git-Url: http://git.sameswireless.fr/l2tpns.git/commitdiff_plain/a0c184ac2133e1f2b70801d9803370a27179fea9

Merge branch 'master' into samesversion
---

a0c184ac2133e1f2b70801d9803370a27179fea9