Merge branch 'master' into openid
authorTom Hughes <tom@compton.nu>
Mon, 17 May 2010 23:16:47 +0000 (00:16 +0100)
committerTom Hughes <tom@compton.nu>
Mon, 17 May 2010 23:16:47 +0000 (00:16 +0100)
commit9f0ea60679c5e13ec321572f02afa5d265ce0c46
tree5a415071d6cb26dd09f9e653cee5512a0ba0e73e
parent362f237e91541b7cef44629432ae500f4b0518f4
parent798cdc1d193b1a46a791dd1ee77591f856e6de74
Merge branch 'master' into openid
config/locales/en.yml