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)
commite48cb2390b22683deb1a0fab8c01e79d3fa908ba
tree2c46e4a94a4acaed8622a785bcb3e21a18e86038
parente843431b6078e2fbfd8782f65f2cd2beadbdb0cc
parent91fc2ec13bb4bf58770085375a91a75f2413fa71
Merge branch 'master' into samesversion
l2tpns.c