From: Michael Vogel <ike@pirati.ca>
Date: Fri, 21 Oct 2016 21:17:58 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/develop' into 1610-duplicate-check
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=b56bdf06eda2dc9196be352f8730b18ee774f766;p=friendica.git

Merge remote-tracking branch 'upstream/develop' into 1610-duplicate-check
---

b56bdf06eda2dc9196be352f8730b18ee774f766