From: Dirk Wagner Date: Mon, 5 May 2014 07:16:08 +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~107 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9838ce3d7ae8fe909b18e0dd5bb37eee9dc4dbe6;p=ipfire-2.x.git Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into asterisk-update --- 9838ce3d7ae8fe909b18e0dd5bb37eee9dc4dbe6