Merge branch 'master' of https://github.com/davmac314/dinit
authorDavin McCall <davmac@davmac.org>
Sun, 19 Jun 2016 19:13:09 +0000 (20:13 +0100)
committerDavin McCall <davmac@davmac.org>
Sun, 19 Jun 2016 19:13:09 +0000 (20:13 +0100)

Trivial merge