Merge 16891:17044 from trunk.
authorTom Hughes <tom@compton.nu>
Thu, 13 Aug 2009 17:18:08 +0000 (17:18 +0000)
committerTom Hughes <tom@compton.nu>
Thu, 13 Aug 2009 17:18:08 +0000 (17:18 +0000)
commit908a6ef409518d86bfd2cdf0d2a82a6c312821c8
tree225e1fe70d74eb8f69764ca224bfd8ae62b2d604
parent0d5be22cb517ebaaab5eb7af13150bf61e41df56
parent565171486f6d90321e0291d5ccc3cf6a1c12e730
Merge 16891:17044 from trunk.
app/controllers/trace_controller.rb
app/models/user.rb
config/locales/en.yml
config/routes.rb
db/migrate/040_create_oauth_tables.rb
db/migrate/041_add_fine_o_auth_permissions.rb
db/migrate/042_add_foreign_keys_to_oauth_tables.rb