Merge remote-tracking branch 'github/pr/790'.
authorPatrice Clement <monsieurp@gentoo.org>
Sat, 6 Feb 2016 10:15:34 +0000 (10:15 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Sat, 6 Feb 2016 10:15:34 +0000 (10:15 +0000)

Trivial merge