From: Dirk Wagner <dirk.wagner@ipfire.org>
Date: Wed, 15 Oct 2014 20:35:24 +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~87
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e823d548024ba9cf5d26f58afd34c12ebc7aab1a;p=ipfire-2.x.git

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

e823d548024ba9cf5d26f58afd34c12ebc7aab1a