From: Michael Vogel Date: Mon, 12 Jan 2015 19:49:00 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/develop' into 1501-better-ostatus X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=7d34648373435fc092466e5d0bae6d5b7653203a;p=friendica.git Merge remote-tracking branch 'upstream/develop' into 1501-better-ostatus --- 7d34648373435fc092466e5d0bae6d5b7653203a