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

This commit is contained in:
MrZYX 2011-01-27 19:06:54 +01:00
commit 9230bf5fe1