Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 13 Sep 2010 13:57:05 +0000 (15:57 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 13 Sep 2010 13:57:05 +0000 (15:57 +0200)
commit3834d135ecb9383995f305cfe4fa18e9c7511495
tree057b5d94edd1b86b58ba01b731d77136221491c1
parent925038e35d5f8a5f9dd5874deb22184d6d56fe1e
parent4527e3eb7dce9104cffa99fb4c67dce0368a39a2
Merge branch 'master' into next

Conflicts:
config/rootfiles/core/40/update.sh