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

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

7f2070ca91aca9e92f3ac4c5b714742c6f9ecc3b