kactivities PKGBUILD
	akonadi PKGBUILD
	fix mariadb conflict. oxygen PKGBUILD
Merge branch 'master' of https://github.com/ArchBSD/abs