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

@@ -615,6 +615,7 @@ buildipfire() {
ipfiremake phpSANE
ipfiremake tunctl
ipfiremake nagios
ipfiremake nagios_nrpe
ipfiremake ebtables
ipfiremake fontconfig
ipfiremake freefont