MrZYX 60c0c4dc76 Merge branch '819-checks-for-redis-conf-in-usr-local-etc' of https://github.com/Dorian/diaspora ... Conflicts: script/server		2011-01-27 18:29:18 +01:00
..
build
cucumber
rails
sanitize_database.rb
server
update-rails-i18n.sh
websocket_server.rb