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

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

* master:
This commit is contained in:
Simon L'nu 2012-03-25 17:06:17 -04:00
parent baeb735315
commit 38b30c1d10

Diff content is not available