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

Gemfile

Gemfile.lock

app/controllers/photos_controller.rb

app/views/layouts/application.html.haml

app/views/shared/_publisher.html.haml

app/views/shared/_right_sections.html.haml

config/initializers/mailer_config.rb

config/locales/devise/devise.da.yml

config/locales/devise/devise.fr.yml

config/locales/devise/devise.ko.yml

config/locales/devise/devise.ru.yml

config/locales/devise/devise.sk.yml

config/locales/diaspora/ar.yml

config/locales/diaspora/bg.yml

config/locales/diaspora/br.yml

config/locales/diaspora/cs.yml

config/locales/diaspora/cy.yml

config/locales/diaspora/da.yml

config/locales/diaspora/de.yml

config/locales/diaspora/de_formal.yml