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

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

4c3598ce2f2774dc639cb7c73c63b01d808a2758