Merge remote-tracking branch 'remotes/github/pr/118'.
authorPatrice Clement <monsieurp@gentoo.org>
Tue, 29 Sep 2015 20:37:21 +0000 (20:37 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Tue, 29 Sep 2015 20:37:21 +0000 (20:37 +0000)

Trivial merge