From: friendica <info@friendica.com>
Date: Fri, 31 Aug 2012 08:29:55 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f88f0bf3f2f6fecc2eb4184f0da01ddc9522223f;p=friendica.git

Merge https://github.com/friendica/friendica into pull
---

f88f0bf3f2f6fecc2eb4184f0da01ddc9522223f