From: friendica <info@friendica.com>
Date: Fri, 27 Apr 2012 22:56:28 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=b3750ab54e126b499bb067f39dd55bade46b3267;p=friendica.git

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

b3750ab54e126b499bb067f39dd55bade46b3267