From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Fri, 13 Apr 2012 09:59:25 +0000 (+0200)
Subject: Merge remote-tracking branch 'friendica/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f6e1ddf7fbcc122f5122336650e1cfaa71aed8e3;p=friendica.git

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

f6e1ddf7fbcc122f5122336650e1cfaa71aed8e3