commit 4242ce877f1674ac20ac16072274fe6b0ba0c885
Author: Daniel Robbins <drobbins@funtoo.org>
Date: Sun Jun 4 12:14:54 2017 -0600

merged from funtoo-staging

merged:

funtoo-staging: 8dfab6e6444f8691a215c04ff3e1b277321ba02e

commit 2c4331f5a709e6a8a0bc8061837e538303a7e6d5
Author: Daniel Robbins <drobbins@funtoo.org>
Date: Mon May 22 00:10:38 2017 -0600

merged from funtoo-staging

merged:

funtoo-staging: 42d8e4f48ea7fd9e3d91f688fce0c09d8f91d6c4