Merge branch 'master' into ppp-update
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 30 Jun 2010 09:36:50 +0000 (11:36 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 30 Jun 2010 09:36:50 +0000 (11:36 +0200)
1  2 
make.sh

diff --cc make.sh
Simple merge