Merge proposals dependent on lp:~netrek-developers/mactrek/upstream-trunk

lp:~netrek-developers/mactrek/upstream-trunk has no merge proposals.