From: Simon L'nu Date: Sat, 3 Mar 2012 18:39:56 +0000 (-0500) Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master' X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=da78d8594f79792f2c144cdb5b76b561ec03b278;p=friendica.git Merge branch 'master', remote-tracking branch 'remotes/upstream/master' * remotes/upstream/master: fixed star/unstar fixed admin fixed editor * master: --- da78d8594f79792f2c144cdb5b76b561ec03b278