From: Dirk Wagner Date: Mon, 14 Apr 2014 11:12:14 +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~111 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7692e381932da5f80092f35bb698cc1a4e0d01ae;p=ipfire-2.x.git Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into asterisk-update --- 7692e381932da5f80092f35bb698cc1a4e0d01ae