From: fabrixxm <fabrix.xm@gmail.com>
Date: Wed, 17 Aug 2011 15:35:37 +0000 (+0200)
Subject: Merge remote-tracking branch 'friendika/master' into newui
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=bdf42473a0341f291cd256323d122aa80bb0cb0b;p=friendica.git

Merge remote-tracking branch 'friendika/master' into newui
---

bdf42473a0341f291cd256323d122aa80bb0cb0b