From 38b30c1d10c83900e18c2b2440ac61a984a60bf3 Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Sun, 25 Mar 2012 17:06:17 -0400
Subject: [PATCH] Merge branch 'master', remote-tracking branch
 'remotes/upstream/master'

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

* master: