Merge branch 'notes'
[rails.git] / app / controllers / friend_controller.rb
2007-05-06 Nick Blackadded messaging and friend stuff that wasn't checked in