Merge branch 'master' of github.com:diaspora/diaspora

app/controllers/users_controller.rb

app/helpers/application_helper.rb

app/models/user.rb

app/views/photos/show.html.haml

config/app_config.yml.example

pkg/fedora/README.md

pkg/fedora/diaspora-setup

pkg/fedora/diaspora-wsd

pkg/fedora/diaspora.spec

pkg/fedora/dist/.gitkeep

pkg/fedora/make-dist.sh

pkg/ubuntu/README.md

pkg/ubuntu/diaspora-install

pkg/ubuntu/diaspora-setup

pkg/ubuntu/diaspora-wsd

pkg/ubuntu/diaspora-wsd.conf

pkg/ubuntu/dist/.gitkeep

public/javascripts/view.js

public/stylesheets/sass/application.sass

script/websocket_server.rb