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

Simple merge
Simple merge
Simple merge