From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 13 May 2015 20:02:46 +0000 (+0200)
Subject: Merge remote-tracking branch 'stevee/core90-fixes'
X-Git-Tag: v2.17-core91~30^2^2~16
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=b47472c1865f1777251a43376286ce884b8a4ba8

Merge remote-tracking branch 'stevee/core90-fixes'
---

b47472c1865f1777251a43376286ce884b8a4ba8