From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 2 Aug 2016 11:18:29 +0000 (+0100)
Subject: Merge remote-tracking branch 'stevee/guardian-2.0' into next
X-Git-Tag: v2.19-core104~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=afc0f6e8849c6b9bed5005a05c8c4a526b63e06d;p=ipfire-2.x.git

Merge remote-tracking branch 'stevee/guardian-2.0' into next
---

afc0f6e8849c6b9bed5005a05c8c4a526b63e06d