From: Dirk Wagner Date: Sun, 15 Jun 2014 20:02:23 +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~99 X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=adbfa4fff56c48aa72bf884dc0abefefea95a33b Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into asterisk-update --- adbfa4fff56c48aa72bf884dc0abefefea95a33b