Merge branch 'logging-tweaks'
authorWilliam Morgan <wmorgan-sup@masanjin.net>
Tue, 8 Sep 2009 19:25:55 +0000 (15:25 -0400)
committerWilliam Morgan <wmorgan-sup@masanjin.net>
Tue, 8 Sep 2009 19:25:55 +0000 (15:25 -0400)
commitffc8f7364d2e0c16ff908ec6ea5b1134effef348
tree88d4cef855ffbaf694acee83e332124402829c33
parentaef0216d7f988ab87a3430c9a65210f0d55dfc64
parentac2d27b230c0afc36eafddec1c387a6ab68a837d
Merge branch 'logging-tweaks'

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