Raphael Sofaer 4fa5731d5e Merge remote branch 'jancborchardt/1410-messages-conversation' ... Conflicts: app/views/conversations/new.haml		2011-07-28 12:45:40 -07:00
..
_conversation.haml
_show.haml
index.haml
new.haml
show.haml
show.js.erb