Merge branch 'master' into openstreetbugs
authorTom Hughes <tom@compton.nu>
Sat, 10 Mar 2012 15:30:25 +0000 (15:30 +0000)
committerTom Hughes <tom@compton.nu>
Sat, 10 Mar 2012 15:30:25 +0000 (15:30 +0000)
commit6aca6cfabf21da48567e8197457dae8785b7324d
tree4157708b9db6eb57edff2602f63b2f38fe73202b
parent6de8c2e6b30485683a9d3aa3e21c4b256fe399bd
parent917d7324a6f1d3f6256b1a541a912ccee84097d1
Merge branch 'master' into openstreetbugs

Conflicts:
config/routes.rb
db/structure.sql
app/views/user/view.html.erb
config/routes.rb