From: Dirk Wagner <dirk.wagner@ipfire.org>
Date: Sun, 27 Jul 2014 20:35:56 +0000 (+0200)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into asterisk-update
X-Git-Tag: v2.17-core89~91
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f9602aa126b9ffcaa32055658c577463c0bff2b4;p=ipfire-2.x.git

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
---

f9602aa126b9ffcaa32055658c577463c0bff2b4