From: Simon L'nu <simon.lnu@gmail.com>
Date: Thu, 3 May 2012 04:25:56 +0000 (-0400)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=0446766f0407b45c78031ad9e5029cc9218b025e;p=friendica.git

Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  diabook-theme: small fix
  diabook-theme: made boxes at right_aside sortable
  use cid rather than uid in perms
  Modify events_post() in mod/events.php to set the `private` field to true when an event is shared with specific people. This is necessary to have event posts show correctly in Diaspora if an event is created visible only to self, but modified later to be visible to others.
  use mysql replace on cache items
  fixing common friends
  rev update
  Moved Meta Viewport from global head.tpl to diabook's header

* master:
---

0446766f0407b45c78031ad9e5029cc9218b025e