From: friendica <info@friendica.com>
Date: Wed, 21 Nov 2012 23:42:20 +0000 (-0800)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=ed1b84fb603eafef6610a9fa1d343c0c5fd8c8ca;p=friendica.git

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

ed1b84fb603eafef6610a9fa1d343c0c5fd8c8ca