From: Dirk Wagner <dirk.wagner@ipfire.org>
Date: Wed, 23 Jul 2014 08:37:02 +0000 (+0200)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into monit
X-Git-Tag: v2.17-core89~71^2~2^2~10
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=9ac9fc3d802db666b94cc85175bef2cfbd335ed5

Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into monit

Conflicts:
	config/rootfiles/packages/asterisk
---

9ac9fc3d802db666b94cc85175bef2cfbd335ed5
diff --cc config/rootfiles/common/armv5tel/initscripts
index 0a1a81109d,1ec9ed4f4b..e856697b9a
mode 100755,100644..100755
--- a/config/rootfiles/common/armv5tel/initscripts
+++ b/config/rootfiles/common/armv5tel/initscripts
diff --cc config/rootfiles/common/i586/initscripts
index d48d6a51be,153a5f49e7..af099ba69b
mode 100755,100644..100755
--- a/config/rootfiles/common/i586/initscripts
+++ b/config/rootfiles/common/i586/initscripts