From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 11 Feb 2015 13:58:10 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: v2.17-core89~66
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=aa2e56a531a44a932ea7c379fd7834043cc3e407

Merge branch 'master' into next
---

aa2e56a531a44a932ea7c379fd7834043cc3e407