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

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

4eb368f153e1e211680aa146c2e17fb63992ea49