From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Sun, 14 Aug 2016 20:05:54 +0000 (+0200)
Subject: Merge branch '3.5rc' of https://github.com/friendica/friendica into 3.5rc
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=bd99eedd9b10792b8c6904d96f562b2a86fcae2b;p=friendica.git

Merge branch '3.5rc' of https://github.com/friendica/friendica into 3.5rc
---

bd99eedd9b10792b8c6904d96f562b2a86fcae2b