From: Michael Vogel <icarus@dabo.de>
Date: Sun, 14 Feb 2016 20:04:59 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/develop' into 1601-api-statuses-lookup
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=92007a1438b8be0bef2c6d72c1e2cc288e7b23ff;p=friendica.git

Merge remote-tracking branch 'upstream/develop' into 1601-api-statuses-lookup
---

92007a1438b8be0bef2c6d72c1e2cc288e7b23ff