maxwell 1adf93ace1 Merge branch 'master' of github.com:diaspora/diaspora ... Conflicts: config/locales/diaspora/en.yml		2010-11-22 16:40:01 -08:00
..
_step_1.html.haml
_step_2.html.haml
_step_3.html.haml
_step_4.html.haml