Merge remote-tracking branch 'remotes/lilrc/bug-557160'
authorIan Delaney <idella4@gentoo.org>
Fri, 6 Nov 2015 12:15:57 +0000 (20:15 +0800)
committerIan Delaney <idella4@gentoo.org>
Fri, 6 Nov 2015 12:17:48 +0000 (20:17 +0800)
Pull request: #https://github.com/gentoo/gentoo/pull/311


Trivial merge