From: Friendika <info@friendika.com>
Date: Thu, 24 Mar 2011 11:06:01 +0000 (-0700)
Subject: Merge branch 'master' of https://github.com/erikl/friendika into erikl-master
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=ba99ce3d0ab77bd62971cd3962d964be1ddee205;p=friendica.git

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

ba99ce3d0ab77bd62971cd3962d964be1ddee205