]> git.notmuchmail.org Git - sup/commit
Merge branch 'custom-search-hook' into next
authorWilliam Morgan <wmorgan-sup@masanjin.net>
Mon, 27 Jul 2009 18:04:52 +0000 (14:04 -0400)
committerWilliam Morgan <wmorgan-sup@masanjin.net>
Mon, 27 Jul 2009 18:04:52 +0000 (14:04 -0400)
commitf3d3bb09ffc817b15b32874a3f33a4480fd863dc
treec77182ca2033e8b71584fd5613a0d6c719f0a2cd
parent28ed14d7ed3c8fff5e24966157ef877c02d189fe
parent8a9f8761acc318f2bfb852480d6076dabb131825
Merge branch 'custom-search-hook' into next

Conflicts:

lib/sup/index.rb
lib/sup/ferret_index.rb