From: Simon L'nu <simon.lnu@gmail.com>
Date: Thu, 26 Jul 2012 17:52:38 +0000 (-0400)
Subject: Merge branch 'master' of github.com:simonlnu/friendica
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=ca4a731bc2cab595e2ebb589eaf47ce6352abbd2;p=friendica.git

Merge branch 'master' of github.com:simonlnu/friendica

* 'master' of github.com:simonlnu/friendica:
---

ca4a731bc2cab595e2ebb589eaf47ce6352abbd2