]> git.notmuchmail.org Git - sup/commit
Merge branch 'logging' into next
authorWilliam Morgan <wmorgan-sup@masanjin.net>
Mon, 17 Aug 2009 19:24:26 +0000 (15:24 -0400)
committerWilliam Morgan <wmorgan-sup@masanjin.net>
Mon, 17 Aug 2009 19:25:05 +0000 (15:25 -0400)
commit631981cbbb728c0bfd62d91a89129169a8a6d2e1
treefe1fabcb58ba672e499a62263c8adc3ead00219b
parent76a7e237c757f6673cbb602b66b6a367459a2560
parent723e222e5143badf905bc80034f0f86690378e6f
Merge branch 'logging' into next

Conflicts:
bin/sup
bin/sup-sync-back
bin/sup-tweak-labels
lib/sup.rb
lib/sup/buffer.rb
lib/sup/message-chunks.rb
lib/sup/suicide.rb
13 files changed:
bin/sup
bin/sup-add
bin/sup-sync
bin/sup-sync-back
bin/sup-tweak-labels
lib/sup.rb
lib/sup/buffer.rb
lib/sup/ferret_index.rb
lib/sup/hook.rb
lib/sup/index.rb
lib/sup/message-chunks.rb
lib/sup/message.rb
lib/sup/util.rb