Merge remote-tracking branch 'remotes/upstream/cm-14.1-rootless' into cm-14.1
authorStricted <info@stricted.net>
Mon, 17 Apr 2017 10:28:21 +0000 (12:28 +0200)
committerStricted <info@stricted.net>
Mon, 17 Apr 2017 10:28:21 +0000 (12:28 +0200)

Trivial merge