danielvincent d6bb5291bc Revert "Merge branch '348-change-email' of https://github.com/mblog/diaspora into mblog-348-change-email" ... This reverts commit 2ac54eeffe, reversing changes made to 3a13657087.		2010-12-13 17:16:56 -08:00
..
getting_started
edit.html.haml	Revert "Merge branch '348-change-email' of https://github.com/mblog/diaspora into mblog-348-change-email"	2010-12-13 17:16:56 -08:00
getting_started.html.haml