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

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

* remotes/upstream/master:
  slackr - better highlighting of current selections
  slackr - knock the sharp edges off the events calendar
  rev update

* master:
---

30b658c42903f703003c793e1ec04b10c9e09147