From: Michael Vogel Date: Wed, 18 Jul 2012 19:03:57 +0000 (+0200) Subject: Merge remote branch 'upstream/master' X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c8f99a8a668d78c81b422b3df1964e8fd2f2e3b7;p=friendica.git Merge remote branch 'upstream/master' --- c8f99a8a668d78c81b422b3df1964e8fd2f2e3b7