zhitomirskiyi 9b00b2c786 Merge branch 'mnutt-9925139-user-shouldnt-mention-non-friends' ... Conflicts: app/models/user.rb spec/integration/receiving_spec.rb spec/models/mention_spec.rb spec/models/status_message_spec.rb		2011-03-10 19:59:12 -08:00
..
contact_deleting_spec.rb	pulling in	2011-03-06 21:37:27 -08:00
receiving_spec.rb	Merge branch 'mnutt-9925139-user-shouldnt-mention-non-friends'	2011-03-10 19:59:12 -08:00