Merge remote-tracking branch 'github/pr/481'.
authorPatrice Clement <monsieurp@gentoo.org>
Thu, 17 Dec 2015 07:52:51 +0000 (07:52 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Thu, 17 Dec 2015 07:52:51 +0000 (07:52 +0000)

Trivial merge