]> git.cworth.org Git - sup/commit
Merge branch 'logging' into next
authorWilliam Morgan <wmorgan-sup@masanjin.net>
Tue, 1 Sep 2009 02:38:15 +0000 (22:38 -0400)
committerWilliam Morgan <wmorgan-sup@masanjin.net>
Tue, 1 Sep 2009 02:38:52 +0000 (22:38 -0400)
commitc7e58d5ea766bc23e3b38d1b7c033ea02093dab8
treed53c870eb72e634dfa4734d1a1ac2e20460d521f
parent69f515653ecdfb20dd3f01f33249e9c7569ce6db
parenteaa762c5b245231324fc3f222351b09833881f65
Merge branch 'logging' into next

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