Merge branch 'master' into samesversion
authorfendo <fendo@bi12info.com>
Mon, 10 Jun 2013 13:04:43 +0000 (15:04 +0200)
committerfendo <fendo@bi12info.com>
Mon, 10 Jun 2013 13:04:43 +0000 (15:04 +0200)
1  2 
l2tpns.c

diff --cc l2tpns.c
Simple merge