[sup-devel] topic branch merge report

[William Morgan <wmorgan-sup@masanjin.net>]

Hi all,

I've merged the following branches down to master:

'thread-joining-fix', 'no-mailcap-on-darwin',
'label-list-mode-auto-update', 'interactive-crypto',
'label-list-mode-hooks', 'refine-inbox-mode', 'poll-unusual',
'attach-wildcards', 'order-names-by-date' and 'save-all-attachments'.

Rich, I think I need your help with the two branches 'xapian-bugfix' and
'xapian-message-state', which are generating a conflict for some reason,
and I don't understand the code well enough to resolve.  Would you be
able to publish a branch ahead of master that has these two merged?
Thanks!
-- 
William <wmorgan-sup@masanjin.net>
_______________________________________________
Sup-devel mailing list
Sup-devel@rubyforge.org
http://rubyforge.org/mailman/listinfo/sup-devel