From: Dirk Wagner <dirk.wagner@ipfire.org>
Date: Wed, 23 Jul 2014 09:07:58 +0000 (+0200)
Subject: Merge branch 'asterisk-update' into monit
X-Git-Tag: v2.17-core91~40^2~1^2~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a1f23a84c7c5b60bf87b30a19451214e59793b9a;p=ipfire-2.x.git

Merge branch 'asterisk-update' into monit

Conflicts:
	config/etc/logrotate.conf
	config/rootfiles/packages/asterisk
---

a1f23a84c7c5b60bf87b30a19451214e59793b9a