Merge remote-tracking branch 'github/pr/504'.
authorPatrice Clement <monsieurp@gentoo.org>
Tue, 22 Dec 2015 09:47:59 +0000 (09:47 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Tue, 22 Dec 2015 10:45:15 +0000 (10:45 +0000)

Trivial merge