bump recommended Ruby version 1.9.3-p484
bump Rails to version 3.2.16
bump to 0.2.0.1
Merge branch 'master' of https://github.com/diaspora/diaspora
Merge branch 'master' of github.com:prellele/diaspora