Merge branch 'master' into samesversion
authorfendo <fendo@bi12info.com>
Wed, 22 May 2013 20:25:27 +0000 (22:25 +0200)
committerfendo <fendo@bi12info.com>
Wed, 22 May 2013 20:25:27 +0000 (22:25 +0200)
1  2 
l2tpns.c

diff --cc l2tpns.c
Simple merge