Merge remote-tracking branch 'remotes/upstream/cm-14.1-rootless' into cm-14.1
authorStricted <info@stricted.net>
Tue, 16 May 2017 19:28:04 +0000 (21:28 +0200)
committerStricted <info@stricted.net>
Tue, 16 May 2017 19:28:04 +0000 (21:28 +0200)

Trivial merge