Ariel Zavala e9f74675e9 Merged with diaspora; fixed conflicts; only 2 red		2010-09-19 11:16:00 -04:00
..
_new_aspect.haml
index.html.haml
manage.html.haml	Merged with diaspora; fixed conflicts; only 2 red	2010-09-19 11:16:00 -04:00
show.html.haml