From: Friendika <info@friendika.com>
Date: Sun, 6 Feb 2011 21:27:37 +0000 (-0800)
Subject: Merge branch 'master' of https://github.com/fabrixxm/friendika into fabrixxm-master
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=3f973445609d604154a687b50a29a753826b7a5e;p=friendica.git

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

3f973445609d604154a687b50a29a753826b7a5e