maxwell 8fb97072df Merge branch '583-password-person-conflict' of https://github.com/flah00/diaspora into flah00-583-password-person-conflict		2010-12-04 18:40:17 -08:00
..
jobs
aspect.rb
comment.rb
contact.rb
invitation.rb
person.rb
photo.rb
post.rb
profile.rb
request.rb
retraction.rb
service.rb
status_message.rb
user.rb	Merge branch '583-password-person-conflict' of https://github.com/flah00/diaspora into flah00-583-password-person-conflict	2010-12-04 18:40:17 -08:00