From: Friendika <info@friendika.com>
Date: Sun, 23 Jan 2011 22:19:42 +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=f649692c25a6846f645383b256026b24d4dde970;p=friendica.git

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

f649692c25a6846f645383b256026b24d4dde970