From: Tom Hughes <tom@compton.nu>
Date: Tue, 11 May 2010 18:53:57 +0000 (+0100)
Subject: Merge branch 'master' into openstreetbugs
X-Git-Tag: live~5064^2~212
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/959442d087b9b25fbec9c78ec122106b82d887dd

Merge branch 'master' into openstreetbugs
---

959442d087b9b25fbec9c78ec122106b82d887dd
diff --cc db/migrate/053_add_map_bug_tables.rb
index 2d3b7348b,000000000..2d3b7348b
mode 100644,000000..100644
--- a/db/migrate/053_add_map_bug_tables.rb
+++ b/db/migrate/053_add_map_bug_tables.rb
diff --cc db/migrate/054_refactor_map_bug_tables.rb
index b45f935cc,000000000..b45f935cc
mode 100644,000000..100644
--- a/db/migrate/054_refactor_map_bug_tables.rb
+++ b/db/migrate/054_refactor_map_bug_tables.rb
diff --cc db/migrate/055_change_map_bug_comment_type.rb
index bf009c3dd,000000000..bf009c3dd
mode 100644,000000..100644
--- a/db/migrate/055_change_map_bug_comment_type.rb
+++ b/db/migrate/055_change_map_bug_comment_type.rb
diff --cc db/migrate/056_add_date_closed.rb
index 7f609cade,000000000..7f609cade
mode 100644,000000..100644
--- a/db/migrate/056_add_date_closed.rb
+++ b/db/migrate/056_add_date_closed.rb
diff --cc db/migrate/057_add_map_bug_comment_event.rb
index ff5f0b352,000000000..ff5f0b352
mode 100644,000000..100644
--- a/db/migrate/057_add_map_bug_comment_event.rb
+++ b/db/migrate/057_add_map_bug_comment_event.rb