ilya 992bd42b55 Merge branch 'master' of github.com:diaspora/diaspora ... Conflicts: spec/models/aspect_spec.rb		2010-10-20 11:30:06 -07:00
..
friending.rb	Clean up specs a little, fix unfriending	2010-10-20 10:28:08 -07:00
querying.rb	MS IZ aspect add and delete for a person	2010-10-19 18:25:59 -07:00
receiving.rb	attack vector where you take posts from valid (unknown) diaspora people is now fixed	2010-10-20 00:42:33 -07:00