Merge remote-tracking branch 'remotes/upstream/cm-14.1-rootless' into cm-14.1
authorStricted <info@stricted.net>
Tue, 9 May 2017 11:35:50 +0000 (13:35 +0200)
committerStricted <info@stricted.net>
Tue, 9 May 2017 11:35:50 +0000 (13:35 +0200)
commit222d7393bdc2aaedf434d5660e3bc2dd13c67c16
tree1504ea14566036fc2b4496d8a144922e26a59ed5
parentc0e270675b113d9797dbe420f3983eef29e26956
parent85d22b398802fbcc13886b48e0f1693b31d6c498
Merge remote-tracking branch 'remotes/upstream/cm-14.1-rootless' into cm-14.1