From: friendica <info@friendica.com>
Date: Fri, 7 Sep 2012 00:21:28 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=40cfcdad2da8c5176b9a025e9e1fbe614e1c867b;p=friendica.git

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

40cfcdad2da8c5176b9a025e9e1fbe614e1c867b