Raphael 70a22ae839 Merge branch 'master' into HEAD ... Conflicts: app/models/post.rb app/models/user.rb config/initializers/socket.rb		2010-09-24 09:15:10 -07:00
..
bootstrap-fedora-diaspora.sh
build
rails
server
websocket_server.rb