From: William Morgan <wmorgan-sup@masanjin.net>
Date: Mon, 3 Aug 2009 16:29:26 +0000 (-0400)
Subject: Merge branch 'xapian'
X-Git-Url: https://git.notmuchmail.org/git?a=commitdiff_plain;h=fa5a06c2904ff4c9cb266d4a9df2b35efa0433e5;p=sup

Merge branch 'xapian'

Conflicts:
	lib/sup/index.rb
---

fa5a06c2904ff4c9cb266d4a9df2b35efa0433e5