From: fendo <fendo@bi12info.com>
Date: Mon, 10 Jun 2013 13:04:43 +0000 (+0200)
Subject: Merge branch 'master' into samesversion
X-Git-Tag: 2.2.1-2sames3.12~4
X-Git-Url: http://git.sameswireless.fr/l2tpns.git/commitdiff_plain/14031c41a5c8e4e2513c6bfd65d5019da7611156?ds=inline

Merge branch 'master' into samesversion
---

14031c41a5c8e4e2513c6bfd65d5019da7611156