maxwell 1adf93ace1 Merge branch 'master' of github.com:diaspora/diaspora ... Conflicts: config/locales/diaspora/en.yml		2010-11-22 16:40:01 -08:00
..
devise	translatable status is good again	2010-11-22 22:30:37 +01:00
diaspora	Merge branch 'master' of github.com:diaspora/diaspora	2010-11-22 16:40:01 -08:00
rails-i18n	Updating rails-i18n	2010-11-21 01:52:59 +01:00