Merge branch 'oi/hipster' of github.com:OpenIndiana/oi-userland into categories
commit6804c2191f25edc8844f221365dff63da57c1ab5
authorAdam Stevko <adam.stevko@gmail.com>
Fri, 1 Apr 2016 22:04:06 +0000 (2 00:04 +0200)
committerAdam Stevko <adam.stevko@gmail.com>
Fri, 1 Apr 2016 22:04:06 +0000 (2 00:04 +0200)
treec18d8232ae5f2379b00aa16187d4804ce4f2110a
parente6d808c172861967d4745696728aa8adfaa69435
parent1ca7d19768dde513852023e38f4157983d39bb14
Merge branch 'oi/hipster' of github.com:OpenIndiana/oi-userland into categories