Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorArne Fitzenreiter <arne.fitzenreiter@ipfire.org>
Tue, 10 Jul 2012 11:26:45 +0000 (13:26 +0200)
committerArne Fitzenreiter <arne.fitzenreiter@ipfire.org>
Tue, 10 Jul 2012 11:26:45 +0000 (13:26 +0200)
commitb0c682c06f9bbbbeaca98efc1d6f48afef1bbe1b
tree53b7d3a2c94d484693197d2cb83edf2e4615eec8
parentd487c74136841221cff3c9b04456fa044e9bf71c
parentace40c90eceaf77ed20ba39a45a2f883aaafa3fe
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
config/rootfiles/core/61/filelists/files