From: Dirk Wagner <dirk.wagner@ipfire.org>
Date: Thu, 23 Oct 2014 18:53:24 +0000 (+0200)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into asterisk-update
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=74381c58f9b1bd895632d1630998e1e7c23fb1bb;p=people%2Farne_f%2Fipfire-2.x.git

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

74381c58f9b1bd895632d1630998e1e7c23fb1bb