From: Dirk Wagner <dirk.wagner@ipfire.org>
Date: Mon, 19 May 2014 10:56:38 +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~104
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=c10ef4bd39e3b25918067da15ba68ee76e252cf4;hp=-c

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

c10ef4bd39e3b25918067da15ba68ee76e252cf4