From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Fri, 18 Feb 2011 19:33:00 +0000 (+0100)
Subject: Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x
X-Git-Tag: v2.9-core47~9
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=48a2495afd78163adfd984689ab1c08091fdd2d3

Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x

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

48a2495afd78163adfd984689ab1c08091fdd2d3
diff --cc config/rootfiles/core/47/filelists/files
index fee8ee2b06,befb6bfb35..adbbd2970a
--- a/config/rootfiles/core/47/filelists/files
+++ b/config/rootfiles/core/47/filelists/files
@@@ -1,4 -1,4 +1,6 @@@
  etc/system-release
 +etc/rc.d/init.d/sshd
  srv/web/ipfire/cgi-bin/services.cgi
 +srv/web/ipfire/cgi-bin/remote.cgi
+ srv/web/ipfire/cgi-bin/ids.cgi
+ var/ipfire/backup/include