Merge remote-tracking branch 'remotes/github/pr/662'
authorAlexis Ballier <aballier@gentoo.org>
Thu, 21 Jan 2016 13:10:54 +0000 (14:10 +0100)
committerAlexis Ballier <aballier@gentoo.org>
Thu, 21 Jan 2016 13:10:54 +0000 (14:10 +0100)

Trivial merge