From: Michael Vogel Date: Sat, 29 Sep 2012 06:35:17 +0000 (+0200) Subject: Merge remote branch 'upstream/master' X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=ea6ced83594ad86cc557c13748db04b63dcbff89;p=friendica.git Merge remote branch 'upstream/master' --- ea6ced83594ad86cc557c13748db04b63dcbff89