Merge remote-tracking branch 'remotes/Elizafox/master'
authorIan Delaney <idella4@gentoo.org>
Sun, 13 Dec 2015 09:59:05 +0000 (17:59 +0800)
committerIan Delaney <idella4@gentoo.org>
Sun, 13 Dec 2015 11:19:41 +0000 (19:19 +0800)
Pull request: https://github.com/gentoo/gentoo/pull/466


Trivial merge