From: Michael Vogel <icarus@dabo.de>
Date: Mon, 25 Apr 2016 14:44:06 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/develop' into 1604-cookie
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f0d5c97c0801e944a520f972a9f80fae04fd80cf;p=friendica.git

Merge remote-tracking branch 'upstream/develop' into 1604-cookie
---

f0d5c97c0801e944a520f972a9f80fae04fd80cf