Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 18 Feb 2011 19:33:00 +0000 (20:33 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 18 Feb 2011 19:33:00 +0000 (20:33 +0100)
Conflicts:
config/rootfiles/core/47/filelists/files

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