From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 2 Aug 2013 08:41:27 +0000 (+0200)
Subject: Merge branch 'ddns-all-inkl' into next
X-Git-Tag: v2.13-core72^2~22
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=52a2f02f41d362b84d294a0b3239d93cd2010a14;p=people%2Fpmueller%2Fipfire-2.x.git

Merge branch 'ddns-all-inkl' into next

Conflicts:
	config/rootfiles/core/72/filelists/files
---

52a2f02f41d362b84d294a0b3239d93cd2010a14
diff --cc config/rootfiles/core/72/filelists/files
index 3a1767ca13,f20186d7bf..f25463113a
--- a/config/rootfiles/core/72/filelists/files
+++ b/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