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

This commit is contained in:
maxwell 2010-12-08 14:21:40 -08:00
commit 6d6e4f92bb

Diff content is not available