Merge remote-tracking branch 'ummeegge/OpenVPN_validating_N2N' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 8 Dec 2014 18:12:39 +0000 (19:12 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 8 Dec 2014 18:12:39 +0000 (19:12 +0100)
1  2 
html/cgi-bin/ovpnmain.cgi

Simple merge