Merge remote-tracking branch 'ms/ipsec-subnets' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 28 Sep 2015 13:21:18 +0000 (14:21 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 28 Sep 2015 13:21:18 +0000 (14:21 +0100)
commitb1881251d6cdd92c7e887813395386afe9692944
tree2f2d9ce3992979116357005353eea3e5285be71c
parent4b046d735d28012d215276ea08272f298e1e8ba1
parent7c8e022c4b3c7d184e4cee8f79b5e7d63f464759
Merge remote-tracking branch 'ms/ipsec-subnets' into next
html/cgi-bin/vpnmain.cgi