]> git.cworth.org Git - sup/commitdiff
projects / sup / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0b5543a 9ba739f)
Merge branch 'master' into next
authorWilliam Morgan <wmorgan-sup@masanjin.net>
Mon, 15 Jun 2009 16:50:39 +0000 (12:50 -0400)
committerWilliam Morgan <wmorgan-sup@masanjin.net>
Mon, 15 Jun 2009 16:50:39 +0000 (12:50 -0400)
Conflicts:

lib/sup/sent.rb


Trivial merge
Carl's lame hacks to sup (see http://sup.rubyforge.org/)