From: Michael Vogel Date: Fri, 29 Jan 2016 09:59:06 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/develop' into 1601-dfrn-import X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=8412eb70668b9626b80e36cc96853bdf11bb6a38;p=friendica.git Merge remote-tracking branch 'upstream/develop' into 1601-dfrn-import --- 8412eb70668b9626b80e36cc96853bdf11bb6a38