Merge branch 'master' into kernel38

This commit is contained in:
Arne Fitzenreiter
2011-04-26 08:51:24 +02:00
10 changed files with 78 additions and 32 deletions

View File

@@ -13,4 +13,5 @@ var/ipfire/langs/de.pl
var/ipfire/langs/en.pl
var/ipfire/langs/es.pl
var/ipfire/langs/fr.pl
var/ipfire/menu.d/20-status.menu
usr/local/bin/scanhd