Merge branch 'ddns-all-inkl' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 2 Aug 2013 08:41:27 +0000 (10:41 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 2 Aug 2013 08:41:27 +0000 (10:41 +0200)
Conflicts:
config/rootfiles/core/72/filelists/files

1  2 
config/rootfiles/core/72/filelists/files

@@@ -1,5 -1,6 +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