From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Thu, 22 Dec 2011 15:35:58 +0000 (+0100)
Subject: Merge remote-tracking branch 'friendica/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=0dce36bdbce7482329105e2c1ef4f3c8b3043803;p=friendica.git

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

0dce36bdbce7482329105e2c1ef4f3c8b3043803