From: Michael Vogel Date: Sat, 21 Apr 2012 17:26:24 +0000 (+0200) Subject: Merge commit 'upstream/master' X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=71e2dbf3522dcf076458805ee65dc976fb35a6f3;p=friendica.git Merge commit 'upstream/master' --- 71e2dbf3522dcf076458805ee65dc976fb35a6f3