Merge branch 'master' into openid
authorTom Hughes <tom@compton.nu>
Sun, 27 Jun 2010 15:29:18 +0000 (16:29 +0100)
committerTom Hughes <tom@compton.nu>
Sun, 27 Jun 2010 15:29:18 +0000 (16:29 +0100)
commit81f5c72c76f36e7c712bac0ad54b37d945caa51f
tree18f110955f8c78290fb9609dc547b5647b07dafd
parent6a3cadb52d010b333a4acea8942bc4c13394e236
parent98d73aead102c88cab0f2ebd2b027545d2e0b836
Merge branch 'master' into openid
config/locales/en.yml
config/locales/is.yml