From: Michael Vogel Date: Sun, 15 Jul 2012 15:26:00 +0000 (+0200) Subject: Merge remote branch 'upstream/master' X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=7aa10d1935e0a61fa9199710ff86431ab24b05e1;p=friendica.git Merge remote branch 'upstream/master' --- 7aa10d1935e0a61fa9199710ff86431ab24b05e1