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

Merge branch 'friendika-master'
---

ea978af9c198b5f02c8c0b3d376a1e598f181912