Merge remote-tracking branch 'github/pr/674'.
authorPatrice Clement <monsieurp@gentoo.org>
Sat, 30 Jan 2016 15:56:16 +0000 (15:56 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Sat, 30 Jan 2016 23:15:47 +0000 (23:15 +0000)

Trivial merge