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)
commitbb490aca81d8063a9ad8dd8f1a023c709c096792
tree9924f9cc2b9980a735b39d74284b8f5dd4429fc1
parentf4928d0e952ddbde662517d781367dd97eab86a7
parent11b5fc0e95e589b0d301e4891c528e3d19171b40
Merge branch 'master' into openstreetbugs

Conflicts:
config/environment.rb