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)
commit8f702d38ec8cc2d2ae5b31ebc9795f28c7920dc5
tree0d1ad179edc142031c823165eee084468987f010
parent222d7393bdc2aaedf434d5660e3bc2dd13c67c16
parent04d278695903b7863f15b321e5457b9852f72cc6
Merge remote-tracking branch 'remotes/upstream/cm-14.1-rootless' into cm-14.1