]> git.cworth.org Git - sup/commit
Merge branch 'xapian'
authorWilliam Morgan <wmorgan-sup@masanjin.net>
Mon, 3 Aug 2009 16:29:26 +0000 (12:29 -0400)
committerWilliam Morgan <wmorgan-sup@masanjin.net>
Mon, 3 Aug 2009 16:29:26 +0000 (12:29 -0400)
commitfa5a06c2904ff4c9cb266d4a9df2b35efa0433e5
tree213055c67e65c90250c7eb1f4e7b8bba2a6dc38b
parentbee999a52dfafceb7a53ef53bcf8a28fbb38c6af
parenteb28079efd788ead7b0c24ba49971f69bcb778c3
Merge branch 'xapian'

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