Merge branch 'master' into openid
authorTom Hughes <tom@compton.nu>
Wed, 16 Jun 2010 20:18:44 +0000 (21:18 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 16 Jun 2010 20:18:44 +0000 (21:18 +0100)
commit6a3cadb52d010b333a4acea8942bc4c13394e236
tree204e10500a03575f237b22c79e8db7ea4f3ee181
parentdc35b597a2210d77e3d3e6996138dfdeb3add4a3
parentb43f9c47145a14b547a900d9559f9aa3fd0895d1
Merge branch 'master' into openid
app/controllers/user_controller.rb
config/locales/en.yml