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

.gitignore

app/helpers/notifications_helper.rb

app/views/sessions/new.mobile.haml

app/views/shared/_stream_element.mobile.haml

config/locales/devise/devise.de.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/el.yml

config/locales/diaspora/en.yml

config/locales/diaspora/en_shaw.yml

config/locales/diaspora/eo.yml

config/locales/diaspora/es-CL.yml

config/locales/diaspora/es.yml

config/locales/diaspora/eu.yml

config/locales/diaspora/fi.yml