Merge branch 'master' into next

This commit is contained in:
Arne Fitzenreiter
2011-06-28 00:49:44 +02:00
6 changed files with 10 additions and 6 deletions

View File

@@ -2,3 +2,4 @@ etc/system-release
var/ipfire/langs/
etc/rc.d/init.d/console
usr/local/sbin/setup
var/ipfire/graphs.pl

View File

@@ -0,0 +1 @@
../../../common/smartmontools