From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Fri, 6 Jan 2012 08:11:48 +0000 (+0100)
Subject: Merge remote-tracking branch 'friendica/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f9b0af6f2f0c57481a0b5b3dc269b2389f3fa872;p=friendica.git

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

f9b0af6f2f0c57481a0b5b3dc269b2389f3fa872