]> git.cworth.org Git - sup/commit
Merge branch 'hook-local-vars' into next
authorWilliam Morgan <wmorgan-sup@masanjin.net>
Sun, 23 Aug 2009 17:24:59 +0000 (13:24 -0400)
committerWilliam Morgan <wmorgan-sup@masanjin.net>
Sun, 23 Aug 2009 17:24:59 +0000 (13:24 -0400)
commitbf30feea5c29d1aa5c1b8bbefa2bf4f4e73b1510
tree0c117ea0b9e041c5cdf632edbe3553c6ad0ce77d
parent20886f4b1d1f92c4db17fbd2639ba47fb8888046
parente459fc846862a1499f3acb2f8a2eb098344ee7ac
Merge branch 'hook-local-vars' into next

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