From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 2 Apr 2011 15:56:33 +0000 (+0200)
Subject: Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=cadb66f381e606df01509e9a4e388b1d3b85752b

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

Conflicts:
	config/rootfiles/core/49/filelists/files
	config/rootfiles/core/49/update.sh
---

cadb66f381e606df01509e9a4e388b1d3b85752b
diff --cc config/rootfiles/core/49/filelists/files
index 6bc22d450,d4ff5e242..ed587ee92
--- a/config/rootfiles/core/49/filelists/files
+++ b/config/rootfiles/core/49/filelists/files
@@@ -1,4 -1,2 +1,5 @@@
  etc/system-release
 +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