From: Michael Vogel Date: Sun, 25 Jan 2015 07:44:42 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/develop' into 1501-global-contacts X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=dff2384e825c4cc38ab9f6c38db3daf6e9da1fc0;p=friendica.git Merge remote-tracking branch 'upstream/develop' into 1501-global-contacts --- dff2384e825c4cc38ab9f6c38db3daf6e9da1fc0