Merge remote-tracking branch 'github/pr/266'
authorAlexis Ballier <aballier@gentoo.org>
Fri, 30 Oct 2015 00:03:34 +0000 (01:03 +0100)
committerAlexis Ballier <aballier@gentoo.org>
Fri, 30 Oct 2015 00:03:53 +0000 (01:03 +0100)

Trivial merge