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'
Merge branch 'master' of git://github.com/diaspora/diaspora into prod

Conflicts:
	Gemfile.lock