]> git.cworth.org Git - sup/commit
Merge branch 'master' into next
authorWilliam Morgan <wmorgan-sup@masanjin.net>
Fri, 4 Sep 2009 15:52:14 +0000 (11:52 -0400)
committerWilliam Morgan <wmorgan-sup@masanjin.net>
Fri, 4 Sep 2009 15:52:14 +0000 (11:52 -0400)
commit99e62d554493df30ee063b2bafb664caaf2263ab
tree45117015b40783c98fbaa76438d84c921fe73355
parentfb1f9e01c6985356058190bb8cf16b9bceb0adcc
parent1cc47908f928359145badddbdbf154d741829965
Merge branch 'master' into next

Conflicts:
lib/sup/message.rb
lib/sup/message.rb