Merge branch 'master' into forum
[edumed.git] / edumed / __init__.py