fdsj
Merge branch 'master' of github.com:diasporg/diaspora

Conflicts:
	db/schema.rb
lfjsdlj
Merge branch 'master' of github.com:diasporg/diaspora
Merge branch 'master' of github.com:diasporg/diaspora
Merge branch 'master' of github.com:diasporg/diaspora
hi
Merge branch 'master' of github.com:diasporg/diaspora
Merge branch 'master' of github.com:diasporg/diaspora
Bump to Rails 3.2.10 as per CVE-2012-5664

https://groups.google.com/group/rubyonrails-security/browse_thread/thread/c2353369fea8c53
Merge branch 'hotfix/0.0.2.1'
yes
Merge remote-tracking branch 'upstream/master'