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
bump Rails to 3.2.11

see:
http://weblog.rubyonrails.org/2013/1/8/Rails-3-2-11-3-1-10-3-0-19-and-2-3-15-have-been-released/
Merge branch 'hotfix/0.0.2.2'
Merge branch 'master' of git://github.com/diaspora/diaspora