From: friendica <info@friendica.com>
Date: Wed, 17 Oct 2012 22:22:54 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=abba881a0224169b3492b0bfd1e198f1a8d42188;p=friendica.git

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

abba881a0224169b3492b0bfd1e198f1a8d42188