From: Michael <icarus@dabo.de>
Date: Fri, 2 Mar 2012 16:44:09 +0000 (+0100)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=ccfe402fb0b92dc8e62dc87137743851441e27f6;p=friendica.git

Merge remote branch 'upstream/master'
---

ccfe402fb0b92dc8e62dc87137743851441e27f6