Merge branch 'master' into cvs
[ikiwiki] / underlays / osm /
2012-03-16  Amitai SchlairMerge branch 'master' into cvs
2012-03-03  Joey Hessmove osm.js to osm underlay and osm does not need javas...
2012-03-03  Antoine Beauprémove js in the right location
2012-03-03  Antoine Beauprésplit off the javascript in a separate file
2012-03-03  Joey Hessadd osm.png