From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 8 Jul 2014 14:19:31 +0000 (+0200)
Subject: Merge branch 'ddns' into next
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=3d4b48ceb2a8f4a83666c673073939256b181cdd

Merge branch 'ddns' into next
---

3d4b48ceb2a8f4a83666c673073939256b181cdd
diff --cc config/rootfiles/core/80/filelists/files
index 2c38e1ea7,a274ebaf2..528137824
--- a/config/rootfiles/core/80/filelists/files
+++ b/config/rootfiles/core/80/filelists/files
@@@ -1,10 -1,8 +1,9 @@@
  etc/system-release
  etc/issue
  etc/rc.d/init.d/dhcrelay
 +etc/rc.d/init.d/dnsmasq
  srv/web/ipfire/cgi-bin/ovpnmain.cgi
  srv/web/ipfire/cgi-bin/routing.cgi
- usr/local/bin/setddns.pl
  usr/sbin/dhcrelay
  var/ipfire/general-functions.pl
  var/ipfire/langs