From: Michael Vogel Date: Fri, 15 Jul 2016 18:12:46 +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=de6f48365bfa8745da49c2682913fa1a19ad9d55;p=friendica.git Merge remote-tracking branch 'upstream/develop' into 1607-api-generic-xml --- de6f48365bfa8745da49c2682913fa1a19ad9d55