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