Merge remote-tracking branch 'github/pr/97'
authorJames Le Cuirot <chewi@gentoo.org>
Thu, 17 Sep 2015 20:47:38 +0000 (21:47 +0100)
committerJames Le Cuirot <chewi@gentoo.org>
Thu, 17 Sep 2015 20:47:38 +0000 (21:47 +0100)

Trivial merge