Merge remote-tracking branch 'remotes/upstream/cm-14.1-rootless' into cm-14.1
authorStricted <info@stricted.net>
Sat, 20 May 2017 17:40:09 +0000 (19:40 +0200)
committerStricted <info@stricted.net>
Sat, 20 May 2017 17:40:09 +0000 (19:40 +0200)
commitb384e3fcb92e54fc7d1c6b3ca73c6f22d20c825b
treef876d62c67e9f7571b3512fd2f7715375f5e133f
parent8f702d38ec8cc2d2ae5b31ebc9795f28c7920dc5
parent5db0f2338eb1c43f34b95caa0986843f33fff0c7
Merge remote-tracking branch 'remotes/upstream/cm-14.1-rootless' into cm-14.1