From: Michael Vogel <icarus@dabo.de>
Date: Sun, 15 Apr 2012 14:49:54 +0000 (+0200)
Subject: Merge commit 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a147d6113c081694d4209002fa5e57106d4c6f41;p=friendica.git

Merge commit 'upstream/master'
---

a147d6113c081694d4209002fa5e57106d4c6f41