From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Fri, 10 Oct 2014 16:13:13 +0000 (+0200)
Subject: Merge branch 'next'
X-Git-Tag: v2.15-core84
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=52dae2ba3f341a928613c832ebe1db042a4f8702;p=people%2Fstevee%2Fipfire-2.x.git

Merge branch 'next'
---

52dae2ba3f341a928613c832ebe1db042a4f8702