From: Michael Vogel <icarus@dabo.de>
Date: Thu, 5 Apr 2012 22:00:46 +0000 (+0200)
Subject: Merge commit 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=34d268544e565985014ada4369e8673c87883a0a;p=friendica.git

Merge commit 'upstream/master'
---

34d268544e565985014ada4369e8673c87883a0a