Merge remote-tracking branch 'remotes/github/pr/115'.
authorPatrice Clement <monsieurp@gentoo.org>
Tue, 29 Sep 2015 21:02:51 +0000 (21:02 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Tue, 29 Sep 2015 21:03:06 +0000 (21:03 +0000)

Trivial merge