Merge remote-tracking branch 'github/pr/365'.
authorPatrice Clement <monsieurp@gentoo.org>
Tue, 17 Nov 2015 10:26:55 +0000 (10:26 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Tue, 17 Nov 2015 10:27:12 +0000 (10:27 +0000)

Trivial merge