Merge pull request #6436 from juga0/features/rfc7844
authorLennart Poettering <lennart@poettering.net>
Thu, 7 Sep 2017 08:08:56 +0000 (10:08 +0200)
committerGitHub <noreply@github.com>
Thu, 7 Sep 2017 08:08:56 +0000 (10:08 +0200)
Features/rfc7844


Trivial merge