Merge remote-tracking branch 'github/pr/525'.
authorPatrice Clement <monsieurp@gentoo.org>
Fri, 25 Dec 2015 20:55:26 +0000 (20:55 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Fri, 25 Dec 2015 20:55:26 +0000 (20:55 +0000)

Trivial merge