Merge branch 'mailer' of github.com:diaspora/diaspora into mailer

This commit is contained in:
maxwell 2010-10-22 00:49:31 -07:00
commit 32849e693a

Diff content is not available