Merge branch 'master' into openid
authorTom Hughes <tom@compton.nu>
Tue, 31 May 2011 18:10:31 +0000 (19:10 +0100)
committerTom Hughes <tom@compton.nu>
Tue, 31 May 2011 18:10:31 +0000 (19:10 +0100)
commit652dbf5044d3f7fdb5f7af1b7e8393c2a79246c6
tree747367f75d65e1cc474aae36c0b478a2d94e5960
parent8d38da6b77b6e10afdf6edccc7bc69e1b567ff5b
parentbf8bbdc22095074e7e15ac29999f0b0d6328133d
Merge branch 'master' into openid

Conflicts:
config/locales/en.yml
config/locales/en.yml
config/locales/is.yml