From: Dirk Wagner <dirk.wagner@ipfire.org>
Date: Mon, 5 Jan 2015 07:34:31 +0000 (+0100)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into asterisk-update
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f7d7241829dfe1c638c8bf8530d3224ea847bfab;p=people%2Fdweismueller%2Fipfire-2.x.git

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

f7d7241829dfe1c638c8bf8530d3224ea847bfab