From: Dirk Wagner <dirk.wagner@ipfire.org>
Date: Tue, 1 Jul 2014 09:11:09 +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~95
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=8e112a784156513c53d97511de528bc2d73f2d11

Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into asterisk-update
---

8e112a784156513c53d97511de528bc2d73f2d11