Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into asterisk-update
authorDirk Wagner <dirk.wagner@ipfire.org>
Tue, 23 Dec 2014 08:02:23 +0000 (09:02 +0100)
committerDirk Wagner <dirk.wagner@ipfire.org>
Tue, 23 Dec 2014 08:02:23 +0000 (09:02 +0100)
1  2 
make.sh

diff --cc make.sh
Simple merge