From: friendica <info@friendica.com>
Date: Fri, 25 Jan 2013 21:50:27 +0000 (-0800)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=37a5ff848d8a785d3914a742adadf28506b2ff8c;p=friendica.git

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

37a5ff848d8a785d3914a742adadf28506b2ff8c