From: Michael Vogel Date: Fri, 15 Jul 2016 15:19:16 +0000 (+0200) Subject: Merge remote-tracking branch 'upstream/develop' into 1607-api-generic-xml X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a64b7704d8d3dedefd94a9e34410c39127eb7de5;p=friendica.git Merge remote-tracking branch 'upstream/develop' into 1607-api-generic-xml --- a64b7704d8d3dedefd94a9e34410c39127eb7de5