Make vanilla to upstream
Merge upstream/master
Merge remote-tracking branch 'upstream/master' into devel
Dont remove /etc/sysctl.conf
Merge pull request #20 from manjaro/master

Merge Master History and changes into Development
Not needed anymore for mhwd
Merge remote-tracking branch 'upstream/development' into devel
Adapt to upstream Packages-Xorg change
Merge branch 'devel'
Forgot to addc pacman.conf for net-openrc
Minor config updates for xfce-minimal-openrc
Somehow pacman.conf files for xfce-minimal-openrc seem to have got lost too..
xfce-minimal-openrc profile updates
Add thus and octopi to xfce-minimal-openrc (for testing)
add thus desktop file as thus seems to work now (thanks to Philm)
Merge changes from master