Merge remote-tracking branch 'remotes/upstream/cm-14.1-rootless' into cm-14.1
authorStricted <info@stricted.net>
Sat, 22 Apr 2017 21:29:07 +0000 (23:29 +0200)
committerStricted <info@stricted.net>
Sat, 22 Apr 2017 21:29:07 +0000 (23:29 +0200)
commitc0e270675b113d9797dbe420f3983eef29e26956
tree0bbf52a7134f13f356d732f9299c9e76107c14ae
parent25effd36277177c123711694d8eedb1f3738de59
parentf183cf4f4abe59a57160772e96231be647fe4d30
Merge remote-tracking branch 'remotes/upstream/cm-14.1-rootless' into cm-14.1