Merge branch 'master' into v2.0
[osm/openvim.git] / osm_openvim / __init__.py
1