From: William Morgan <wmorgan-sup@masanjin.net>
Date: Mon, 27 Jul 2009 15:59:29 +0000 (-0400)
Subject: Merge branch 'xapian' into next
X-Git-Url: https://git.notmuchmail.org/git?a=commitdiff_plain;h=5ffac00720d64525c44ce959cd3c780e9624e72c;p=sup

Merge branch 'xapian' into next

Conflicts:

	lib/sup/poll.rb
---

5ffac00720d64525c44ce959cd3c780e9624e72c