Merge remote-tracking branch 'github/pr/250'
authorAlexis Ballier <aballier@gentoo.org>
Mon, 19 Oct 2015 16:24:12 +0000 (18:24 +0200)
committerAlexis Ballier <aballier@gentoo.org>
Mon, 19 Oct 2015 16:24:12 +0000 (18:24 +0200)

Trivial merge