Merge branch 'master' into openid
authorTom Hughes <tom@compton.nu>
Sun, 9 May 2010 11:26:40 +0000 (12:26 +0100)
committerTom Hughes <tom@compton.nu>
Sun, 9 May 2010 11:26:40 +0000 (12:26 +0100)
commit48d450060b3b5c19bb1fa8e85341d76177de26d2
tree86d9bbb0d31969d6e14deb44a5a2f77b62aef11d
parentebd109c946d71b3ccc616ea3966e56ae019638d7
parent7e5c998a87ef776276c8015c17cd9e7be79a1692
Merge branch 'master' into openid
app/controllers/user_controller.rb