commit 587964eb45aed7c2d1f05ecefe52461d032c679c parent 0b5543a02c5d2dfc1a725e63e4a922bea9f903fd Author: William Morgan <wmorgan-sup@masanjin.net> Date: Mon, 15 Jun 2009 12:50:39 -0400 Merge branch 'master' into next Conflicts: lib/sup/sent.rb
commit 587964eb45aed7c2d1f05ecefe52461d032c679c parent 0b5543a02c5d2dfc1a725e63e4a922bea9f903fd Author: William Morgan <wmorgan-sup@masanjin.net> Date: Mon, 15 Jun 2009 12:50:39 -0400 Merge branch 'master' into next Conflicts: lib/sup/sent.rb