maxwell 709e348457 Merge branch 'master' of github.com:diaspora/diaspora ... Conflicts: spec/fixtures/users.yaml		2010-11-23 00:15:26 -08:00
..
devise	added getting_started text and new press logos	2010-11-22 21:07:01 -08:00
diaspora	Merge branch 'master' of github.com:diaspora/diaspora	2010-11-23 00:15:26 -08:00
rails-i18n	Updating rails-i18n	2010-11-21 01:52:59 +01:00