Merge branch 'master' into terms
authorTom Hughes <tom@compton.nu>
Fri, 7 May 2010 21:23:20 +0000 (22:23 +0100)
committerTom Hughes <tom@compton.nu>
Fri, 7 May 2010 21:23:20 +0000 (22:23 +0100)
commit303e5d3eb99284ab4fa41be85f831333f2154b0d
tree3a9176d91e00ada570be50caad950fa8c2d5eb4d
parentffd7b02b0c3696ffa5d38ddeeb8078df19e841e0
parent1eba0609296c8208fd69062a189371c05ebce11e
Merge branch 'master' into terms

Conflicts:
config/application.yml
lib/osm.rb
public/stylesheets/common.css
app/controllers/user_controller.rb
config/application.yml
config/environment.rb
config/locales/de.yml
config/locales/en.yml
config/routes.rb
lib/osm.rb
public/stylesheets/common.css