From: gerhard6380 <gerhard@seeber.at>
Date: Wed, 10 Aug 2016 21:54:54 +0000 (+0200)
Subject: Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=b8af78d8775c9e32d74068ed23d03574ba5e80c4;p=friendica.git

Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop
---

b8af78d8775c9e32d74068ed23d03574ba5e80c4