Pistos/diaspora — pull request #87 by rekado (2012-03-10 03:02:59+00:00)
Title: Minimise differences to diaspora inc code

- no changes to function
- code with the same purpose now is identical with the Diaspora Inc.
code to make future merges easier