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

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

be9985a3aed1bfbbc6964973e2f12d0bd7928c04