Merge aur-upload and upload-to-aur into baaur.