Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 2 Apr 2011 15:56:33 +0000 (17:56 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 2 Apr 2011 15:56:33 +0000 (17:56 +0200)
Conflicts:
config/rootfiles/core/49/filelists/files
config/rootfiles/core/49/update.sh

1  2 
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