From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Fri, 24 Aug 2018 18:22:05 +0000 (+0200)
Subject: Merge branch 'core123' of git.ipfire.org:/pub/git/ipfire-2.x into core123
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e5eedea01de6e70c0440f0c97e418ca053382424;p=people%2Fms%2Fipfire-2.x.git

Merge branch 'core123' of git.ipfire.org:/pub/git/ipfire-2.x into core123
---

e5eedea01de6e70c0440f0c97e418ca053382424