Merge remote-tracking branch 'github/pr/643'.
authorPatrice Clement <monsieurp@gentoo.org>
Wed, 13 Jan 2016 14:06:43 +0000 (14:06 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Wed, 13 Jan 2016 14:06:43 +0000 (14:06 +0000)

Trivial merge