From: fabrixxm <fabrix.xm@gmail.com>
Date: Tue, 8 Feb 2011 17:13:41 +0000 (+0100)
Subject: Merge branch 'friendika-master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=26dfb73f48d4fcd4671d136e53f52bb81995ea34;p=friendica.git

Merge branch 'friendika-master'
---

26dfb73f48d4fcd4671d136e53f52bb81995ea34