danielgrippi 106ae983d5 Merge branch 'master' into follow. all specs green. ... Conflicts: app/controllers/application_controller.rb app/controllers/people_controller.rb app/models/person.rb config/assets.yml db/schema.rb public/javascripts/aspect-edit.js spec/controllers/aspects_controller_spec.rb spec/models/user/querying_spec.rb spec/spec_helper.rb		2011-04-11 17:48:37 -07:00
..
dispatch.rb	not delivering to local for profiles	2011-03-29 17:23:28 -07:00
receiver.rb	Merge branch 'master' into follow. all specs green.	2011-04-11 17:48:37 -07:00