From: Benjamin Cama <benoar@dolka.fr>
Date: Thu, 28 Jul 2011 15:59:33 +0000 (+0200)
Subject: Merge branch 'upstream'
X-Git-Tag: debian/2.2.1-1~1
X-Git-Url: http://git.sameswireless.fr/l2tpns.git/commitdiff_plain/fbd2194031738e255e7b1297f2c7e612c1a6944e?ds=sidebyside

Merge branch 'upstream'
---

fbd2194031738e255e7b1297f2c7e612c1a6944e