Tom Hughes e660e60966 Merge branch 'master' into openstreetbugs ... Conflicts: Gemfile Gemfile.lock lib/migrate.rb		2012-03-08 18:23:27 +00:00
..
assets/openlayers	Merge branch 'master' into openstreetbugs	2012-01-05 20:15:53 +00:00
gems/rots-0.2.1	Remove ancient (and unused) composite_primary_keys gem	2012-02-15 17:48:17 +00:00
generators/daemon	Import the daemon generator as the SVN external never works.	2008-08-07 17:46:34 +00:00