Merge branch 'next' of ssh://arne_f@ipfire.org/pub/git/ipfire-2.x into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Sun, 14 Mar 2010 10:40:33 +0000 (11:40 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sun, 14 Mar 2010 10:40:33 +0000 (11:40 +0100)
commit0cc5df4e29dc872bdcb475875077f4339dc0d435
tree013de0243d03fbc1738fba3522f10f0b419db766
parentf06c8adbc747554d7b7581e40b40139285848c54
parent26eed11e1758a7d1cc667b70c6cf38a734df66df
Merge branch 'next' of ssh://arne_f@ipfire.org/pub/git/ipfire-2.x into next