From: Simon L'nu <simon.lnu@gmail.com>
Date: Mon, 27 Feb 2012 14:08:48 +0000 (-0500)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=b1cdc5a93273f7536cb1a3c9870214f6d0aaaed0;p=friendica.git

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

* remotes/upstream/master:
  fixed syntax errors
  add plugin hooks to enotify

* master:
---