From: friendica <info@friendica.com>
Date: Wed, 25 Apr 2012 00:55:56 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=139c2c1bbdffeb8df07004a9fdf919adf0bac72c;p=friendica.git

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

139c2c1bbdffeb8df07004a9fdf919adf0bac72c