The usual
Merge branch 'master' of https://github.com/alucryd/aur-alucryd

Conflicts:
	pantheon/gala-bzr/PKGBUILD
	unsupported/aegisub-git/PKGBUILD