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)
1  2 
config/locales/en.yml

Simple merge