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