[aur-general] merge freecol-svn into freecol-git