Merge branch 'master' of github.com:diaspora/diaspora_rails into 192_magic_funhouse

This commit is contained in:
maxwell 2010-06-20 21:56:28 -07:00
commit 3ce92c7c9d

Diff content is not available