From: Friendika <info@friendika.com>
Date: Sat, 5 Feb 2011 20:59:04 +0000 (-0800)
Subject: Merge branch 'master' of https://github.com/omigeot/friendika into omigeot-master
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c4ddee005ebcf912c913e12a17e65ab8826650a6;p=friendica.git

Merge branch 'master' of https://github.com/omigeot/friendika into omigeot-master
---

c4ddee005ebcf912c913e12a17e65ab8826650a6