Merge branch 'ddns-all-inkl' into next

Conflicts:
	config/rootfiles/core/72/filelists/files
This commit is contained in:
Michael Tremer
2013-08-02 10:41:27 +02:00
3 changed files with 25 additions and 0 deletions

View File

@@ -1,5 +1,7 @@
etc/system-release
etc/issue
etc/rc.d/init.d/firewall
srv/web/ipfire/cgi-bin/ddns.cgi
srv/web/ipfire/cgi-bin/vpnmain.cgi
usr/local/bin/openvpnctrl
usr/local/bin/setddns.pl