Merge branch 'rspezial'
authorChristian Schmidt <maniacikarus@ipfire.org>
Fri, 13 Jun 2008 15:14:55 +0000 (17:14 +0200)
committerChristian Schmidt <maniacikarus@ipfire.org>
Fri, 13 Jun 2008 15:14:55 +0000 (17:14 +0200)
commit13704e5b1c27dee12c68daf48adb663f12b6f14d
tree3f99432b29c49b8650cec11f6fd638bef73c2857
parent070fb401aab4b5a0573f0e805c4c2cf2149634d4
parent6fb081997f7bd3cdb307527a1b78858f7514511e
Merge branch 'rspezial'

Conflicts:

config/rootfiles/core/15/files
config/rootfiles/core/15/update.sh
lfs/collectd
make.sh
doc/packages-list.txt
make.sh