From: Michael Vogel Date: Sun, 4 Jan 2015 19:21:49 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/develop' into issue-1218 X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=003e87b112d3955cbfe758807a29eabf6b94974c;p=friendica.git Merge remote-tracking branch 'upstream/develop' into issue-1218 --- 003e87b112d3955cbfe758807a29eabf6b94974c