From: Dirk Wagner 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-Tag: v2.17-core89~82 X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=f7d7241829dfe1c638c8bf8530d3224ea847bfab Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into asterisk-update --- f7d7241829dfe1c638c8bf8530d3224ea847bfab