From: Simon L'nu <simon.lnu@gmail.com>
Date: Wed, 23 May 2012 09:03:05 +0000 (-0400)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=bd12902d7b384c4ba38ae40c4fa1f34f7e5393b4;p=friendica.git

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

* remotes/upstream/master:
  photo rotation
  event calendar theming
  import quattro event reminder
  mark bubbles unsupported
  keep FB out of private notes
  clear submanage, etc from session on logout
  if identity (uid) changes - reload any other open browser windows on next ping.

* master:
---

bd12902d7b384c4ba38ae40c4fa1f34f7e5393b4