From: Simon L'nu <simon.lnu@gmail.com>
Date: Thu, 1 Mar 2012 04:26:49 +0000 (-0500)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=b7ab2a2fc92bbd7ec3a506e18f950579e10719eb;p=friendica.git

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

* remotes/upstream/master:
  yet more work on notifications
  notification enhancements
  better handling of multiple notifications for same item, and old notifications

* master:
---

b7ab2a2fc92bbd7ec3a506e18f950579e10719eb