From: Michael Vogel Date: Mon, 5 Aug 2013 18:32:02 +0000 (+0200) Subject: Merge remote-tracking branch 'upstream/master' X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=741b932cc9ad30127642258ade0f52eee866c507;p=friendica.git Merge remote-tracking branch 'upstream/master' --- 741b932cc9ad30127642258ade0f52eee866c507