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

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

* remotes/upstream/master:
  break up poller into separate processes
  add tooltip title to common_tabs
  PRIVACY: if wall is blocked, don't provide public keywords in HTML meta
  Diabook-dark update, it's almost useable now (if you're lenient).
  Added "important changes" to admin menu for admins who don't follow the github properly.

* master:
---

c661dc502f1ab4a6361faea1271d3c9a4aafa4ba