Merge branch 'master' into openid
authorTom Hughes <tom@compton.nu>
Sun, 22 May 2011 17:01:15 +0000 (18:01 +0100)
committerTom Hughes <tom@compton.nu>
Sun, 22 May 2011 17:01:15 +0000 (18:01 +0100)
commita37e1b8f7035bfac0e38f5b95ea643c601e1c9b1
treebe284e1f54d7afdf2dc49bf04ad5ebb6a277644e
parentd768ef31c90eefca22885bd61c7d235be2e87cc8
parent8faad225f0677de3b43e0afd7a914be89ed43b2b
Merge branch 'master' into openid

Conflicts:
app/views/user/login.html.erb
app/views/user/login.html.erb
app/views/user/terms.html.erb
config/locales/en.yml
public/stylesheets/common.css