]> git.cworth.org Git - sup/commit
Merge branch 'xapian' into next
authorWilliam Morgan <wmorgan-sup@masanjin.net>
Mon, 27 Jul 2009 15:59:29 +0000 (11:59 -0400)
committerWilliam Morgan <wmorgan-sup@masanjin.net>
Mon, 27 Jul 2009 15:59:29 +0000 (11:59 -0400)
commit5ffac00720d64525c44ce959cd3c780e9624e72c
tree66de3cadd068d60366e18b42357aeb6245aa6f5b
parent587964eb45aed7c2d1f05ecefe52461d032c679c
parent63f87a5ff3a996352cd733b6ac2e432c9e86ab97
Merge branch 'xapian' into next

Conflicts:

lib/sup/poll.rb
lib/sup/message.rb