From: fendo <fendo@bi12info.com>
Date: Wed, 22 May 2013 20:25:27 +0000 (+0200)
Subject: Merge branch 'master' into samesversion
X-Git-Tag: 2.2.1-2sames3.9~1
X-Git-Url: http://git.sameswireless.fr/l2tpns.git/commitdiff_plain/e48cb2390b22683deb1a0fab8c01e79d3fa908ba?ds=inline;hp=--cc

Merge branch 'master' into samesversion
---

e48cb2390b22683deb1a0fab8c01e79d3fa908ba