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

Conflicts:
	config/rootfiles/core/47/filelists/files
This commit is contained in:
Arne Fitzenreiter
2011-02-18 20:33:00 +01:00
7 changed files with 135 additions and 16 deletions

View File

@@ -2,3 +2,5 @@ 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