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

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

2a3f94e4521f00142b99ba4fa5f4ec093159cbb7