From: Michael Vogel Date: Thu, 1 Jan 2015 23:02:45 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/develop' X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f9a6cbd89edfc3940c58d4a790a93e6c7d74b01a;p=friendica.git Merge remote-tracking branch 'upstream/develop' --- f9a6cbd89edfc3940c58d4a790a93e6c7d74b01a