Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
authorChristian Schmidt <maniacikarus@ipfire.org>
Sat, 2 Apr 2011 17:49:11 +0000 (19:49 +0200)
committerChristian Schmidt <maniacikarus@ipfire.org>
Sat, 2 Apr 2011 17:49:11 +0000 (19:49 +0200)
Conflicts:
config/rootfiles/core/49/filelists/files

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