]> git.cworth.org Git - sup/commit
Merge branch 'master' into next
authorWilliam Morgan <wmorgan-sup@masanjin.net>
Tue, 2 Jun 2009 14:41:41 +0000 (07:41 -0700)
committerWilliam Morgan <wmorgan-sup@masanjin.net>
Tue, 2 Jun 2009 14:41:41 +0000 (07:41 -0700)
commitb0587850a0cd616fe5340706abae83576952c22d
tree249437a20f0432269d14de30d8af74a617e8eb1f
parentc89a592127fc203103563b6fe4ad36670da6da0d
parent5cb77d7f09872013df43d9e96cdd4078c21e0aa1
Merge branch 'master' into next

Conflicts:

lib/sup/poll.rb
lib/sup/poll.rb