From: Dirk Wagner <dirk.wagner@ipfire.org>
Date: Thu, 31 Jul 2014 08:53:43 +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~90
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=24c6cb44e2ff3bc03c6e5eb1ca40126cca0dbd3b;p=ipfire-2.x.git

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

24c6cb44e2ff3bc03c6e5eb1ca40126cca0dbd3b