From: friendica <info@friendica.com>
Date: Mon, 29 Apr 2013 04:03:21 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c08e791e436bce69ff7a5aa21275af6c9ba513ab;p=friendica.git

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

c08e791e436bce69ff7a5aa21275af6c9ba513ab