Merge branch 'master' into bug/fix-invalid-annotations
[osm/N2VC.git] / CONTRIBUTORS
1 Benjamin Saller
2 Tim Van Steenburgh