From: Dirk Wagner Date: Tue, 23 Dec 2014 08:02:23 +0000 (+0100) Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into asterisk-update X-Git-Tag: v2.17-core89~83 X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=601f8347ccb1e9c5e3f250ff26d4097ecd698875 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into asterisk-update --- 601f8347ccb1e9c5e3f250ff26d4097ecd698875