Merge remote-tracking branch 'remotes/arcriley/master'
authorIan Delaney <idella4@gentoo.org>
Wed, 9 Dec 2015 14:44:23 +0000 (22:44 +0800)
committerIan Delaney <idella4@gentoo.org>
Wed, 9 Dec 2015 14:46:27 +0000 (22:46 +0800)
Pull request: https://github.com/gentoo/gentoo/pull


Trivial merge