Merge branch 'master' into python
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 7 May 2011 18:43:22 +0000 (20:43 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 7 May 2011 18:43:22 +0000 (20:43 +0200)
1  2 
make.sh

diff --cc make.sh
Simple merge