Merge remote-tracking branch 'github/pr/230'
authorAlexis Ballier <aballier@gentoo.org>
Fri, 16 Oct 2015 17:10:19 +0000 (19:10 +0200)
committerAlexis Ballier <aballier@gentoo.org>
Fri, 16 Oct 2015 17:10:19 +0000 (19:10 +0200)

Trivial merge