Merge remote-tracking branch 'remotes/jasom/master'
authorIan Delaney <idella4@gentoo.org>
Wed, 27 Jan 2016 03:27:28 +0000 (11:27 +0800)
committerIan Delaney <idella4@gentoo.org>
Wed, 27 Jan 2016 03:28:33 +0000 (11:28 +0800)
Pull request: https://github.com/gentoo/gentoo/pull/725


Trivial merge