Merge branch 'master' into openid
authorTom Hughes <tom@compton.nu>
Wed, 28 Jul 2010 20:39:46 +0000 (21:39 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 28 Jul 2010 20:39:46 +0000 (21:39 +0100)
commit03fb042591bf60cd74aa277ee3de98f02d8486d3
tree11db5c4c1c9b534059c4fd67f87a95b565624420
parent81f5c72c76f36e7c712bac0ad54b37d945caa51f
parent72984673067a37a1ea687709a33b18263f850633
Merge branch 'master' into openid
app/models/user.rb
config/locales/en.yml
config/locales/is.yml