sup

commit 09e6a71e232d2d3352fe45b13789c3441e3ac937
parent 0b8ea502ed8e7536661db066fe046f936a3473a2
Author: William Morgan <wmorgan-sup@masanjin.net>
Date:   Mon, 12 Oct 2009 09:51:09 -0400

Merge branch 'master' into next

Conflicts:
	lib/sup/ferret_index.rb

Diffstat:

1 file changed, 0 insertions(+), 1 deletion(-)
diff --git a/lib/sup/ferret_index.rb b/lib/sup/ferret_index.rb
@@ -340,7 +340,6 @@ EOS
     query = {}
 
     subs = HookManager.run("custom-search", :subs => s) || s
-
     subs = subs.gsub(/\b(to|from):(\S+)\b/) do
       field, name = $1, $2
       if(p = ContactManager.contact_for(name))