Merge branch 'github-pr-104'
authorJames Le Cuirot <chewi@gentoo.org>
Tue, 29 Sep 2015 21:18:47 +0000 (22:18 +0100)
committerJames Le Cuirot <chewi@gentoo.org>
Tue, 29 Sep 2015 21:20:04 +0000 (22:20 +0100)

Trivial merge