From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Thu, 17 Nov 2011 12:40:27 +0000 (+0100)
Subject: Merge remote-tracking branch 'friendica/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=844a36e2b6c9cd8e934b57b7d56b7a9863f12929;p=friendica.git

Merge remote-tracking branch 'friendica/master'
---

844a36e2b6c9cd8e934b57b7d56b7a9863f12929