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

.gitignore

app/controllers/albums_controller.rb

app/controllers/publics_controller.rb

config/initializers/git_info.rb

pkg/fedora/.gitignore

pkg/fedora/README.md

pkg/fedora/SOURCES

pkg/fedora/add-bundle.diff

pkg/fedora/diaspora-bundle.spec

pkg/fedora/diaspora-reset

pkg/fedora/diaspora-setup

pkg/fedora/diaspora-wsd

pkg/fedora/diaspora.logconf

pkg/fedora/diaspora.spec

pkg/fedora/make-dist.sh

pkg/fedora/make_rel_symlink.py

spec/controllers/publics_controller_spec.rb

spec/models/person_spec.rb

spec/models/photo_spec.rb

tmp/.gitkeep