merge 15807:16012 from rails_port
authorThomas Wood <grand.edgemaster@gmail.com>
Fri, 19 Jun 2009 22:53:16 +0000 (22:53 +0000)
committerThomas Wood <grand.edgemaster@gmail.com>
Fri, 19 Jun 2009 22:53:16 +0000 (22:53 +0000)
commitff03138a978406b431da71aba64941d87b509098
tree1e2b9a6e1287a3a509f835e5e0ca1867dde4c409
parent3828fa6f9f6140f25a02589fad7aa9604a7b091c
parent98a86836d27cead19b4024427ee33beed66cdb48
merge 15807:16012 from rails_port
app/views/changeset/_changeset.html.erb
app/views/layouts/site.html.erb
app/views/user/view.html.erb
config/locales/en.yml
config/routes.rb