Merge branch 'master' into 1.9.2

README.md

@@ -44,6 +44,7 @@ file [bug reports](https://github.com/diaspora/diaspora/issues) right here on
 github.
 
 Ongoing discussion:
+
 - [Diaspora Developer Google Group](http://groups.google.com/group/diaspora-dev)
 - [Diaspora Discussion Google Group](http://groups.google.com/group/diaspora-discuss)
 - [Diaspora Q&A site](http://diaspora.shapado.com/)
@@ -52,7 +53,7 @@ Ongoing discussion:
 
 More general info and updates about the project can be found on:
 [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).
 
 If you wish to contact us privately about any exploits in Diaspora you may