Merge ssh://repo.or.cz/srv/git/gfxprim