Parnell Springmeyer a26a796d5c

Merging against master - updating smokingpig, rebase was going to be messy

2017-01-26 02:00:04 -08:00

..

activation

Fix #19382 set ownership of /var/empty to root:root

2016-10-09 12:01:47 +02:00

boot

Merging against master - updating smokingpig, rebase was going to be messy

2017-01-26 02:00:04 -08:00

etc

Merge remote-tracking branch 'upstream/master' into staging

2016-10-02 10:36:47 +03:00