Merge branch 'custom-search-hook'
authorWilliam Morgan <wmorgan-sup@masanjin.net>
Tue, 8 Sep 2009 19:58:28 +0000 (15:58 -0400)
committerWilliam Morgan <wmorgan-sup@masanjin.net>
Tue, 8 Sep 2009 19:58:28 +0000 (15:58 -0400)
commit8903cdedc810b5570b5d2cfb35d60683782aa84a
tree64ec3aa00c1d948dc01cb6d8ee8283fb09997859
parentc8562c943ee4d956df93dea76a71e7ff2160fb4b
parent6a88cfad209417cef169d4cb52a25d7d7071a7b5
Merge branch 'custom-search-hook'

Conflicts:
lib/sup/hook.rb
lib/sup/index.rb
lib/sup/ferret_index.rb
lib/sup/xapian_index.rb