Merge branch 'master' into openstreetbugs
authorTom Hughes <tom@compton.nu>
Fri, 14 May 2010 21:50:38 +0000 (22:50 +0100)
committerTom Hughes <tom@compton.nu>
Fri, 14 May 2010 21:50:38 +0000 (22:50 +0100)
1  2 
config/environment.rb
lib/osm.rb

Simple merge
diff --cc lib/osm.rb
Simple merge