From: Hypolite Petovan <ben.lort@gmail.com>
Date: Wed, 25 Jan 2017 20:28:54 +0000 (-0500)
Subject: Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=cb37dfd0a1d54214c55a8555ad2812fb8e2b0202;p=friendica.git

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

cb37dfd0a1d54214c55a8555ad2812fb8e2b0202