From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 30 Nov 2013 11:39:33 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: v2.13-core74~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=532b997c65fba44c2c5778fd7622fafe513cc245;p=ipfire-2.x.git

Merge branch 'master' into next
---

532b997c65fba44c2c5778fd7622fafe513cc245