From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Tue, 24 Jun 2014 06:05:39 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: v2.15-core80~71
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a788e50410b204d4ef1f436fbd25fc67f792cd29;p=ipfire-2.x.git

Merge branch 'master' into next
---

a788e50410b204d4ef1f436fbd25fc67f792cd29