Merge remote-tracking branch 'github/pr/851'.
authorPatrice Clement <monsieurp@gentoo.org>
Thu, 18 Feb 2016 19:39:08 +0000 (19:39 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Thu, 18 Feb 2016 19:39:34 +0000 (19:39 +0000)
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>

Trivial merge