[aur-general] Merge requests

[Rikard Falkeborn]

Hello,
Please merge/delete the following:

Merge haxe-svn [https://aur.archlinux.org/packages/haxe-svn] into haxe-git [
https://aur.archlinux.org/packages/haxe-git] (upstream switched to git)

Merge htop-svn [https://aur.archlinux.org/packages/htop-svn] into htop-git [
https://aur.archlinux.org/packages/htop-git] (upstream switched to git)

Delete https://aur.archlinux.org/packages/osgocean-git/ (or possible merge
into [https://aur.archlinux.org/packages/osgocean-git/]. According to
maintainers comment, it was uploaded by mistake and should have been an
svn-package. The packages has no votes and no comments except for one
saying it was accidently uploaded as a -git package.


Best regards,