From: friendica <info@friendica.com>
Date: Sun, 21 Apr 2013 23:07:26 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a34b1ceb3a3aaa432698cd3bb5914550f22443a5;p=friendica.git

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

a34b1ceb3a3aaa432698cd3bb5914550f22443a5