From: Christian Schmidt <maniacikarus@ipfire.org>
Date: Sat, 2 Apr 2011 17:49:11 +0000 (+0200)
Subject: Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
X-Git-Tag: v2.9-core49~37^2~2
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=80c7f007fe5c70b1bbfa56286806e73ae1e93bfa

Merge branch 'master' of git://git.ipfire.org/ipfire-2.x

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

80c7f007fe5c70b1bbfa56286806e73ae1e93bfa
diff --cc config/rootfiles/core/49/filelists/files
index 8a642aa7ec,ed587ee921..0051c60f99
--- a/config/rootfiles/core/49/filelists/files
+++ b/config/rootfiles/core/49/filelists/files
@@@ -1,3 -1,5 +1,6 @@@
  etc/system-release
 +etc/init.d/squid
+ var/ipfire/backup/bin/backup.pl
+ srv/web/ipfire/cgi-bin/ids.cgi
+ srv/web/ipfire/cgi-bin/pppsetup.cgi
  srv/web/ipfire/cgi-bin/proxy.cgi