Merge branch 'master' into openstreetbugs
authorTom Hughes <tom@compton.nu>
Sun, 17 Oct 2010 10:02:11 +0000 (11:02 +0100)
committerTom Hughes <tom@compton.nu>
Sun, 17 Oct 2010 10:02:11 +0000 (11:02 +0100)
commita1cb0f04d476101116087286ff072d3a137355cb
tree584b8bfe38b69175393f5d6ee2a838cd6a07a40c
parent6fb857020092c909043c4521b91a040f3bb16937
parent86596c0d1fb640f9a87680880d07606678e033fe
Merge branch 'master' into openstreetbugs

Conflicts:
app/views/site/index.html.erb
app/views/site/index.html.erb
config/locales/en.yml
config/routes.rb