From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Mon, 2 Jun 2014 18:31:20 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/next'
X-Git-Tag: v2.15-core79~39
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3e611b5e0301de8858cddaa9b9a9d3f8a95f4a39;p=ipfire-2.x.git

Merge remote-tracking branch 'origin/next'
---

3e611b5e0301de8858cddaa9b9a9d3f8a95f4a39