danielvincent 385e1673ab Merge branch 'master' into getting-started ... Conflicts: app/controllers/users_controller.rb app/views/users/_account.haml app/views/users/_profile.haml		2010-10-26 16:50:57 -07:00
..
album.rb
aspect.rb
comment.rb
person.rb
photo.rb
post.rb
profile.rb
request.rb
retraction.rb
service.rb
status_message.rb
user.rb	Merge branch 'master' into getting-started	2010-10-26 16:50:57 -07:00