Automated merge with file:///home/pycon/pycon-stuff/pycon_site
Automated merge with file:///home/pycon/pycon-stuff/pycon_site


Former-commit-id: f8f932c59332b7ae967020750c1d3f26d993482f
artcz/epcon,leriomaggio/pycon_site,barrachri/epcon,leriomaggio/pycon_site,barrachri/epcon,malemburg/epcon,pythonitalia/pycon_site,artcz/epcon,malemburg/epcon,pythonitalia/pycon_site,pythonitalia/pycon_site,EuroPython/epcon,barrachri/epcon,barrachri/epcon,PythonSanSebastian/epcon,PythonSanSebastian/epcon,pythonitalia/pycon_site,barrachri/epcon,malemburg/epcon,artcz/epcon,artcz/epcon,matrixise/epcon,matrixise/epcon,leriomaggio/pycon_site,PythonSanSebastian/epcon,leriomaggio/pycon_site,matrixise/epcon,leriomaggio/pycon_site,matrixise/epcon,malemburg/epcon,PythonSanSebastian/epcon,matrixise/epcon,EuroPython/epcon,PythonSanSebastian/epcon,malemburg/epcon,PythonSanSebastian/epcon,matrixise/epcon,malemburg/epcon,artcz/epcon,EuroPython/epcon,barrachri/epcon,pythonitalia/pycon_site,artcz/epcon,EuroPython/epcon