From: William Morgan <wmorgan-sup@masanjin.net>
Date: Sun, 23 Aug 2009 17:24:59 +0000 (-0400)
Subject: Merge branch 'hook-local-vars' into next
X-Git-Url: https://git.notmuchmail.org/git?a=commitdiff_plain;h=bf30feea5c29d1aa5c1b8bbefa2bf4f4e73b1510;p=sup

Merge branch 'hook-local-vars' into next

Conflicts:
	lib/sup/hook.rb
---

bf30feea5c29d1aa5c1b8bbefa2bf4f4e73b1510