From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Tue, 20 Dec 2011 16:18:19 +0000 (+0100)
Subject: Merge remote-tracking branch 'friendica/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=ba732c97c10a1f6f712f78c97d7d9bd51c104160;p=friendica.git

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

ba732c97c10a1f6f712f78c97d7d9bd51c104160