From: Michael Vogel Date: Tue, 4 Sep 2012 05:22:59 +0000 (+0200) Subject: Merge remote branch 'upstream/master' X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=59d378913df2bb236631df750c9b12b5c6175d66;p=friendica.git Merge remote branch 'upstream/master' --- 59d378913df2bb236631df750c9b12b5c6175d66