Michael Tremer 661cd276b6 Merge remote-tracking branch 'ummeegge/openvpn' into next ...

Conflicts:
	html/cgi-bin/ovpnmain.cgi
	langs/de/cgi-bin/de.pl
	langs/en/cgi-bin/en.pl

2014-05-11 18:47:11 +02:00

..

cgi-bin

Merge remote-tracking branch 'ummeegge/openvpn' into next

2014-05-11 18:47:11 +02:00

install

setup: add nic identify function.

2013-10-06 09:00:17 +02:00