Merge branch 'master' into openstreetbugs
authorTom Hughes <tom@compton.nu>
Fri, 7 May 2010 21:29:09 +0000 (22:29 +0100)
committerTom Hughes <tom@compton.nu>
Fri, 7 May 2010 21:29:09 +0000 (22:29 +0100)
commit160429e62d88810ec49ccc9c504edee675dca080
tree60b3e2270de76e8538af7f24f5d389c0cb2baa6c
parent5898b494df440ba9659ac8fbe2e150285a9a85a6
parent1eba0609296c8208fd69062a189371c05ebce11e
Merge branch 'master' into openstreetbugs

Conflicts:
lib/osm.rb
config/environment.rb
config/locales/en.yml
config/routes.rb
lib/osm.rb