Merge from master
authorfendo <fendo@bi12info.com>
Tue, 21 May 2013 09:54:43 +0000 (11:54 +0200)
committerfendo <fendo@bi12info.com>
Tue, 21 May 2013 09:54:43 +0000 (11:54 +0200)
commit59e6083b5ecbb2a8e9ab511ac2f8da40b5c82f66
tree85e7c5af803910964d6e577f3fd081f612b04cc7
parent56223c36f99ab1c106ee503976b34c92bb6d9088
parent9c1869ccb199bce1b649cd7923e662f9a88e3488
Merge from master
l2tpns.c
l2tpns.h
ppp.c