git merge bs

diff --cc FS/FS/Record.pm
Simple merge

diff --cc httemplate/search/elements/search.html
index 5058a1a,476b509..1e9ce5c
--- 1/httemplate/search/elements/search.html
--- 2/httemplate/search/elements/search.html
+++ b/httemplate/search/elements/search.html
@@@ -30,11 -30,11 +30,16 @@@ Example
                         'addl_from' => '', #'LEFT JOIN othertable USING ( key )',
                         'extra_sql' => '', #'AND otherstuff', #'WHERE onlystuff',
                         'order_by'  => 'ORDER BY something',
-    
+ 
                       },
                       # "select * from tablename";
++<<<<<<< HEAD
 +   
 +    #required (now even if 'query' is an SQL query string)
++=======
+ 
+     #required unless 'query' is an SQL query string (shouldn't be...)
++>>>>>>> 95144265eeb3ecd13b16708dbdd75dd3701f92ad
      'count_query' => 'SELECT COUNT(*) FROM tablename',
  
      ###