Merge remote-tracking branch 'github/pr/253'
authorAlexis Ballier <aballier@gentoo.org>
Sun, 18 Oct 2015 18:05:35 +0000 (20:05 +0200)
committerAlexis Ballier <aballier@gentoo.org>
Sun, 18 Oct 2015 18:07:27 +0000 (20:07 +0200)

Trivial merge