From: Michael Vogel Date: Fri, 17 May 2013 06:08:34 +0000 (+0200) Subject: Merge remote-tracking branch 'upstream/master' X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=03c489150c9b56695bd8233a7aba2c6a29b15a67;p=friendica.git Merge remote-tracking branch 'upstream/master' --- 03c489150c9b56695bd8233a7aba2c6a29b15a67