Merge remote-tracking branch 'github/pr/332'
authorAlexis Ballier <aballier@gentoo.org>
Sun, 8 Nov 2015 10:06:34 +0000 (11:06 +0100)
committerAlexis Ballier <aballier@gentoo.org>
Sun, 8 Nov 2015 10:06:34 +0000 (11:06 +0100)

Trivial merge