From: friendica <info@friendica.com>
Date: Fri, 4 May 2012 13:43:24 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=37d4181fde392b5d31d77531255b345d9a0e718b;p=friendica.git

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

37d4181fde392b5d31d77531255b345d9a0e718b