From: Michael Vogel Date: Sat, 14 Apr 2012 11:15:25 +0000 (+0200) Subject: Merge commit 'upstream/master' X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=4e220ec391514fbdeaa7d64abfd1752a9b44bbaa;p=friendica.git Merge commit 'upstream/master' --- 4e220ec391514fbdeaa7d64abfd1752a9b44bbaa