From: Friendika <info@friendika.com>
Date: Thu, 27 Jan 2011 21:09:58 +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=1d9f67743883c48c9db28dee6fecd58e0dca90ba;p=friendica.git

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

1d9f67743883c48c9db28dee6fecd58e0dca90ba