Merging 16820:16891 from trunk.
authorMatt Amos <zerebubuth@gmail.com>
Thu, 6 Aug 2009 16:24:39 +0000 (16:24 +0000)
committerMatt Amos <zerebubuth@gmail.com>
Thu, 6 Aug 2009 16:24:39 +0000 (16:24 +0000)
commit0d5be22cb517ebaaab5eb7af13150bf61e41df56
tree7b7505f2194b231b83a2323ae6bbf2d353c58131
parent0a122639c947265ef3b606ef2e56ada234404bc9
parenta9a55db130eb2538e0807f618f57506d0099a266
Merging 16820:16891 from trunk.
app/controllers/application_controller.rb
app/controllers/changeset_controller.rb
app/controllers/node_controller.rb
app/controllers/user_controller.rb
config/locales/de.yml
config/locales/en.yml