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

Gemfile.lock

app/controllers/registrations_controller.rb

app/helpers/status_messages_helper.rb

app/models/user.rb

app/views/status_messages/_status_message.html.haml

config/locales/diaspora/en.yml

pkg/fedora/README.md

pkg/fedora/diaspora-bundle.spec

pkg/fedora/diaspora.spec

pkg/fedora/make-dist.sh

pkg/ubuntu/README.md

spec/controllers/dev_utilities_controller_spec.rb

spec/controllers/registrations_controller_spec.rb

spec/factories.rb

spec/helpers/status_messages_helper_spec.rb

spec/models/user_spec.rb