From: Simon L'nu <simon.lnu@gmail.com>
Date: Sun, 25 Mar 2012 21:06:17 +0000 (-0400)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=38b30c1d10c83900e18c2b2440ac61a984a60bf3;p=friendica.git

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

* remotes/upstream/master:
  small fixes
  enotify plugin hook
  NOTIFY_SYSTEM

* master:
---