Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into asterisk-update
authorDirk Wagner <dirk.wagner@ipfire.org>
Sun, 27 Jul 2014 20:35:56 +0000 (22:35 +0200)
committerDirk Wagner <dirk.wagner@ipfire.org>
Sun, 27 Jul 2014 20:35:56 +0000 (22:35 +0200)
commitf9602aa126b9ffcaa32055658c577463c0bff2b4
tree32ce9b99f7117da11f330eef74dc011e70f58df8
parent65418d1d211b9425013b0f8dcefa9b944a62d1bb
parent10cd52ba8e0f1c44666cd4a2bf9845c4e783a238
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into asterisk-update

Conflicts:
config/etc/logrotate.conf
config/rootfiles/packages/asterisk
make.sh