From: Michael Vogel <icarus@dabo.de>
Date: Fri, 13 Nov 2015 08:48:34 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/develop' into 1511-avatar
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=6ddf62bdf703f1dda6dddab96bf71928bc1f0891;p=friendica.git

Merge remote-tracking branch 'upstream/develop' into 1511-avatar
---

6ddf62bdf703f1dda6dddab96bf71928bc1f0891