From: fendo <fendo@bi12info.com>
Date: Thu, 28 Mar 2013 09:29:32 +0000 (+0100)
Subject: Merge branch 'master' into samesversion
X-Git-Tag: 2.2.1-2sames3.8~3
X-Git-Url: http://git.sameswireless.fr/l2tpns.git/commitdiff_plain/58d994f8f4aa2a6465dc9a2f13e7ba8ddf412ec7?ds=inline;hp=--cc

Merge branch 'master' into samesversion
---

58d994f8f4aa2a6465dc9a2f13e7ba8ddf412ec7