From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Fri, 8 May 2015 16:31:47 +0000 (+0200)
Subject: Merge branch 'next'
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2fd3387aec57a23e43a70531aba3b58bbb11b19f;p=people%2Fjschlag%2Fipfire-2.x.git

Merge branch 'next'
---

2fd3387aec57a23e43a70531aba3b58bbb11b19f