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

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

ae79de3039e0d4ef630aff197bf8256f4abed1cc