Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into asterisk-update
authorDirk Wagner <dirk.wagner@ipfire.org>
Mon, 11 Aug 2014 19:05:14 +0000 (21:05 +0200)
committerDirk Wagner <dirk.wagner@ipfire.org>
Mon, 11 Aug 2014 19:05:14 +0000 (21:05 +0200)
1  2 
make.sh

diff --cc make.sh
Simple merge