From b1cdc5a93273f7536cb1a3c9870214f6d0aaaed0 Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Mon, 27 Feb 2012 09:08:48 -0500
Subject: [PATCH] Merge branch 'master', remote-tracking branch
 'remotes/upstream/master'

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

* master: