Merge remote branch 'jbhannah/master'

This commit is contained in:
Raphael 2010-10-07 11:08:39 -07:00
commit 4ecf4213f0

View file

@ -56,7 +56,7 @@ Ongoing discussion:
More general info and updates about the project can be found on: More general info and updates about the project can be found on:
[Our blog](http://joindiaspora.com), [Our blog](http://joindiaspora.com),
[and on Twitter](http://twitter.com/joindiaspora). [and on Twitter](http://twitter.com/joindiaspora).
Also, be sure to join the official [mailing list](http://http://eepurl.com/Vebk). Also, be sure to join the official [mailing list](http://eepurl.com/Vebk).
If you wish to contact us privately about any exploits in Diaspora you may If you wish to contact us privately about any exploits in Diaspora you may
find, you can email find, you can email