From: Michael Vogel Date: Sat, 8 Jun 2013 10:30:36 +0000 (+0200) Subject: Merge remote-tracking branch 'upstream/master' X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=323186864e56096a2515ab699ebdd6a82a35d20c;p=friendica.git Merge remote-tracking branch 'upstream/master' --- 323186864e56096a2515ab699ebdd6a82a35d20c