Merge branch 'v1.1'
[osm/SO.git] / manifest / LICENSE