Merge branch 'console-mode'
authorWilliam Morgan <wmorgan-sup@masanjin.net>
Tue, 8 Sep 2009 19:37:51 +0000 (15:37 -0400)
committerWilliam Morgan <wmorgan-sup@masanjin.net>
Tue, 8 Sep 2009 19:37:51 +0000 (15:37 -0400)
commit2388e4a48a6d3ea5e626fccf9588a6a177e7065e
tree48f687903025bf765970287a394880c89b078feb
parent5a5e955182c1a53279bd0d62647e4c12dfebc66e
parent8b6d66b49a51e759ef4825b68d4a3740919038ba
Merge branch 'console-mode'

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