Raphael fd8028db33 Revert "Revert "Merge remote branch 'upstream/master'"" ... This reverts commit 1481056af2.		2010-10-20 09:51:55 -07:00
..
_new_aspect.haml
_no_friends_message.haml
_no_posts_message.haml
index.html.haml
manage.html.haml
show.html.haml