Merge branch 'master' into samesversion
authorfendo <fendo@bi12info.com>
Mon, 29 Apr 2013 16:32:06 +0000 (18:32 +0200)
committerfendo <fendo@bi12info.com>
Mon, 29 Apr 2013 16:32:06 +0000 (18:32 +0200)
1  2 
l2tpns.c

diff --cc l2tpns.c
Simple merge