From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Mon, 2 Jun 2014 16:04:50 +0000 (+0200)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
X-Git-Tag: v2.15-core79~40^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e0080803742226fed532dfead30c6f7d0d27e968;p=ipfire-2.x.git

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

e0080803742226fed532dfead30c6f7d0d27e968