From: Michael Vogel Date: Sat, 22 Jun 2013 16:31:28 +0000 (+0200) Subject: Merge remote-tracking branch 'upstream/master' X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=16737298b4126ba58f5ae0c209892092c9cdc883;p=friendica.git Merge remote-tracking branch 'upstream/master' --- 16737298b4126ba58f5ae0c209892092c9cdc883