resolve merge conflict from archive_sent branch
authorHamish Downer <dmishd@gmail.com>
Sun, 19 Jun 2011 23:27:52 +0000 (00:27 +0100)
committerHamish Downer <dmishd@gmail.com>
Sun, 19 Jun 2011 23:27:52 +0000 (00:27 +0100)
commit5697a8ba17241369230de8c7437c96a583e6272e
tree6422add89a8b2cbd94f652859d6376ecba4e0daf
parent142f3888a478376de068d5b5bf5ccdbf710e7c87
parent072d4974fbbd12e86dd4a316530eef626468f0d3
resolve merge conflict from archive_sent branch
lib/sup.rb
lib/sup/sent.rb