From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Mon, 9 Dec 2013 23:13:20 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: v2.13-core74~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=afa75939328ba211a8905da1749711d2189c70bf;p=ipfire-2.x.git

Merge branch 'master' into next
---

afa75939328ba211a8905da1749711d2189c70bf