Merge remote-tracking branch 'remotes/github/pr/1196'
authorAlexis Ballier <aballier@gentoo.org>
Wed, 6 Apr 2016 08:47:59 +0000 (10:47 +0200)
committerAlexis Ballier <aballier@gentoo.org>
Wed, 6 Apr 2016 08:47:59 +0000 (10:47 +0200)
commitda50abe68fb70f7e76dd950b25f2b23fb5a20d78
tree7d6ba1f2f08e78499ce000a8782776f4a96ec405
parent4219ef5e126e9f93a8950bf064d508421c910099
parent8c30a0f821910f6a7c373ac7aef78135dd1eb2dc
Merge remote-tracking branch 'remotes/github/pr/1196'