From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Fri, 30 Mar 2012 17:37:43 +0000 (+0200)
Subject: Merge remote-tracking branch 'friendica/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=77f57e1b135674f48a37e7cf0b1d7bb9172665ca;p=friendica.git

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

77f57e1b135674f48a37e7cf0b1d7bb9172665ca