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

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

cb05e677a96e1312263c0a1c63ee10cea62268b1