From: Dirk Wagner Date: Fri, 12 Sep 2014 21:29:32 +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~88 X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=e05ac9dbd076a5eec59645df5676e53604729117 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into asterisk-update --- e05ac9dbd076a5eec59645df5676e53604729117