Merge branch 'common-cvs-git-upstream' into fdn-mods

Signed-off-by: Benjamin Cama <benoar@dolka.fr>
2012-02-02 02:15:14 +01:00 · 2012-02-02 02:15:14 +01:00 · 99921507eb
commit 99921507eb
parent bceebb9a9d 152b5b67a4
30 changed files with 115 additions and 213 deletions
--- a/l2tpns.c
+++ b/l2tpns.c
@ -4,8 +4,6 @@
 // Copyright (c) 2002 FireBrick (Andrews & Arnold Ltd / Watchfront Ltd) - GPL licenced
 // vim: sw=8 ts=8

-char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.176 2011/01/20 12:48:40 bodea Exp $";
-
 #include <arpa/inet.h>
 #include <assert.h>
 #include <errno.h>