Merge from master
[osm/SO.git] / manifest / LICENSE