Merge remote-tracking branch 'github/pr/693'.
authorPatrice Clement <monsieurp@gentoo.org>
Wed, 20 Jan 2016 14:31:35 +0000 (14:31 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Wed, 20 Jan 2016 14:43:45 +0000 (14:43 +0000)

Trivial merge