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

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

ed7e626ed26904a2114e858ec13b64c5c0b127b6