From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 30 Nov 2018 23:44:58 +0000 (+0100)
Subject: Merge pull request #11002 from keszybz/path_join-merging
X-Git-Tag: v240~164
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac20048fc02f1409caaffd268e2acae618c9d01a;p=thirdparty%2Fsystemd.git

Merge pull request #11002 from keszybz/path_join-merging

Path join merging
---

ac20048fc02f1409caaffd268e2acae618c9d01a