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

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

ae43a96d70d0cda4238de6e50d940a9cb36c15ef