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)
commit273706ae09862364deaa0287a3b563340300fdea
tree1643f358082cf679bc05c8aab28cba0896f4bd15
parent568ce75c9ad0e19a14afb97d9d0832364232bee8
parent407ba399da7508fdad9924875153525245de1dc7
Merge branch 'master' into openstreetbugs
config/environment.rb
lib/osm.rb