Tom Hughes 6fb8570200 Merge branch 'master' into openstreetbugs ... Conflicts: config/environment.rb config/routes.rb		2010-09-06 12:51:50 +01:00
..
controllers	Merge branch 'master' into openstreetbugs	2010-09-06 12:51:50 +01:00
helpers	Fix scoping of reverse geocode result	2010-07-23 00:53:36 +01:00
models	Merge branch 'master' into openstreetbugs	2010-09-06 12:51:50 +01:00
views	Merge branch 'master' into openstreetbugs	2010-09-06 12:51:50 +01:00