From: Michael <heluecht@pirati.ca>
Date: Fri, 2 Dec 2016 09:54:34 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/develop' into 1612-spool
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=b904aaff11ad002a75c80f855ea75f9fc429a470;p=friendica.git

Merge remote-tracking branch 'upstream/develop' into 1612-spool
---

b904aaff11ad002a75c80f855ea75f9fc429a470