Merge remote-tracking branch 'github/pr/218'.
authorPatrice Clement <monsieurp@gentoo.org>
Tue, 17 Nov 2015 14:01:33 +0000 (14:01 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Tue, 17 Nov 2015 14:05:25 +0000 (14:05 +0000)

Trivial merge