From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 4 Oct 2017 15:10:07 +0000 (+0100)
Subject: Merge branch 'captive-portal' into next
X-Git-Tag: v2.19-core115~60
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=027614d2dc3107a4e071e8dac49ce8a74c36e4ea;p=ipfire-2.x.git

Merge branch 'captive-portal' into next
---

027614d2dc3107a4e071e8dac49ce8a74c36e4ea