Merge from master
authorfendo <fendo@bi12info.com>
Tue, 12 Nov 2013 21:38:40 +0000 (22:38 +0100)
committerfendo <fendo@bi12info.com>
Tue, 12 Nov 2013 21:38:40 +0000 (22:38 +0100)
commitdac7fe82bb8d933fb3a68cb9c0256dac6f4470ae
tree4d521b4d3bb903945a78afa400afaa0dae21a3bd
parent30b561eb71683b52894abacf0a607d7d6932e4c1
parent6b70732490a095f1937c7ad8882d5dd164de4e7e
Merge from master
l2tpns.c
l2tpns.h
ppp.c