From: Simon L'nu Date: Tue, 22 May 2012 01:23:40 +0000 (-0400) Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master' X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=867e3b33d11a8403ce2d7eda567b8eb7ba58bda7;p=friendica.git Merge branch 'master', remote-tracking branch 'remotes/upstream/master' * remotes/upstream/master: rev update, bug 428, 429, and ability to block globaldir submissions from demo sites * master: --- 867e3b33d11a8403ce2d7eda567b8eb7ba58bda7