Merge remote-tracking branch 'origin/master' into reduce_userland_deps
commit34d00f8d57f665d37becfad9e9574a5778e88395
authorLauri Tirkkonen <lotheac@iki.fi>
Tue, 29 Nov 2016 19:13:20 +0000 (29 21:13 +0200)
committerLauri Tirkkonen <lotheac@iki.fi>
Tue, 29 Nov 2016 19:13:20 +0000 (29 21:13 +0200)
tree2bf2766ab41cf8f4203c0bb0a017df82e1f00f0c
parent534840b6fe85c09451e911d40d826a893628335d
parentee916cdc229103e5519bb9e66e8c9020cc049cb5
Merge remote-tracking branch 'origin/master' into reduce_userland_deps