Merge branch 'master' into next

Conflicts:
	doc/language_missings
This commit is contained in:
Arne Fitzenreiter
2011-08-09 05:49:10 +02:00
30 changed files with 3434 additions and 165 deletions

View File

@@ -58,6 +58,7 @@ var/ipfire/langs
#var/ipfire/langs/es.pl
#var/ipfire/langs/fr.pl
#var/ipfire/langs/pl.pl
#var/ipfire/langs/ru.pl
#var/ipfire/langs/list
var/ipfire/logging
#var/ipfire/logging/settings