Merge branch 'master' of github.com:badgerman/eressea
Merge branch 'master' of github.com:eressea/server
Merge branch 'master' of github.com:eressea/server
create link to an eressea.ini before runnign tests