From: pixelroot <info@pixelbits.de>
Date: Tue, 23 Oct 2012 12:23:48 +0000 (+0200)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=db5482e609061b80bc226460b6ddc54b80a9c0f4;p=friendica.git

Merge remote branch 'upstream/master'
---

db5482e609061b80bc226460b6ddc54b80a9c0f4