Raphael 1bba4c60f7 Merge remote branch 'MrZYX/untranslated-strings' ... Conflicts: app/views/aspects/manage.html.haml config/locales/diaspora/en.yml		2010-11-04 20:05:57 -07:00
..
devise	made a bunch of strings translatable	2010-11-04 20:49:50 +01:00
diaspora	Merge remote branch 'MrZYX/untranslated-strings'	2010-11-04 20:05:57 -07:00