]> git.cworth.org Git - sup/commit
Merge branch 'master' into next
authorWilliam Morgan <wmorgan-sup@masanjin.net>
Wed, 16 Jan 2008 03:06:48 +0000 (19:06 -0800)
committerWilliam Morgan <wmorgan-sup@masanjin.net>
Wed, 16 Jan 2008 03:06:48 +0000 (19:06 -0800)
commit2f4d892aaa51da20df9ebaaea24401e71d826321
treec4ba74672db604002c940140e625b7234adc2839
parente46eb6be10617eb75cbc426de82f9f7e49d921bc
parentf498025a70092a4f29322e7be8f578e525fae0fe
Merge branch 'master' into next

Conflicts:

lib/sup.rb
Rakefile
lib/sup.rb