Merging changes into planet.osm

https://www.openstreetmap.org/user/Baloo Uriza/diary/5441