Merge branch 'master' of http://cascardo.info/eventmanager/
[cascardo/eventmanager.git] / conteudo / __init__.py