[aur-general] Merge nicotine-plus-svn under *git