Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into monit
authorDirk Wagner <dirk.wagner@ipfire.org>
Wed, 23 Jul 2014 08:37:02 +0000 (10:37 +0200)
committerDirk Wagner <dirk.wagner@ipfire.org>
Wed, 23 Jul 2014 08:37:02 +0000 (10:37 +0200)
Conflicts:
config/rootfiles/packages/asterisk

1  2 
config/rootfiles/common/armv5tel/initscripts
config/rootfiles/common/i586/initscripts
make.sh

diff --cc make.sh
Simple merge