Merge branch 'master' into openstreetbugs
authorTom Hughes <tom@compton.nu>
Sat, 21 May 2011 10:21:01 +0000 (11:21 +0100)
committerTom Hughes <tom@compton.nu>
Sat, 21 May 2011 10:21:01 +0000 (11:21 +0100)
Conflicts:
config/environment.rb


Trivial merge