commit e284dda34735f1e191a196ac30a8c3b4f8da839d
Author: Daniel Robbins <drobbins@funtoo.org>
Date: Sun Jul 16 12:10:57 2017 -0600

merged from funtoo-staging

merged:

funtoo-staging: 12373fedc9313fdef98b1b1fdb8928cfb34a9f51

commit efc97a5cb17398fc647e219c856ea3cac9dc6410
Author: Daniel Robbins <drobbins@funtoo.org>
Date: Thu Jun 8 12:10:47 2017 -0600

merged from funtoo-staging

merged:

funtoo-staging: bf790da3e9b30c67f6453e9173ead1eeb7fd9202