From: Michael Vogel Date: Sun, 20 Oct 2013 14:36:02 +0000 (+0200) Subject: Merge remote-tracking branch 'upstream/master' X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=78444591a6ef620cf30fb82cc4dbdccd5160797a;p=friendica.git Merge remote-tracking branch 'upstream/master' --- 78444591a6ef620cf30fb82cc4dbdccd5160797a