From: Michael Vogel Date: Sun, 2 Sep 2012 15:50:25 +0000 (+0200) Subject: Merge remote branch 'upstream/master' X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f6818ab2438f2274c5d820bc9b1f90ff7476c0b7;p=friendica.git Merge remote branch 'upstream/master' --- f6818ab2438f2274c5d820bc9b1f90ff7476c0b7