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

Trivial merge