updated
Merge branch 'master' of github.com:EuroPython/europython.xml