Merge branch 'next' of ssh://arne_f@ipfire.org/pub/git/ipfire-2.x into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Thu, 18 Feb 2010 07:37:47 +0000 (08:37 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Thu, 18 Feb 2010 07:37:47 +0000 (08:37 +0100)
Conflicts:
doc/packages-list.txt

1  2 
doc/packages-list.txt
make.sh

Simple merge
diff --cc make.sh
Simple merge