Merge commit '3db1ea76a02993663d40e90c58da989212b9e81a' into gnorb-1.0.1

diff --cc packages/gnorb/gnorb-bbdb.el
index 66be7938db83a5ee8d9e2a7cafa036d465c451a6,058011cc58e4fd364bf69404231736482b37c40a..4d32e20bcf8bfe3cbcb8e20fb53f9cc9c60ba8f1
--- 1/packages/gnorb/gnorb-bbdb.el
--- 2/gnorb-bbdb.el
+++ b/packages/gnorb/gnorb-bbdb.el
@@@ -395,15 -391,17 +395,15 @@@ both, use \"C-u\" before the \"*\".
         (mapconcat
          'identity
          (delete-dups
 -         (cl-mapcan
 -          (lambda (r)
 -            (bbdb-record-xfield-split r gnorb-bbdb-org-tag-field))
 -          records))
 -        "|")))
 +         (cl-mapcan (lambda (r)
 +                   (bbdb-record-xfield-split r gnorb-bbdb-org-tag-field))
-                  records)))
-         "|")))
++                 records))
++          "|")))
      (if tag-string
        ;; C-u = all headings, not just todos
 -      (if (equal current-prefix-arg '(4))
 -          (org-tags-view nil tag-string)
 -        (org-tags-view t tag-string))
 +      (org-tags-view (not (equal current-prefix-arg '(4)))
 +                       tag-string)
-       (error "No org-tags field present")))
+       (error "No org-tags field present"))))
  
  ;;;###autoload
  (defun gnorb-bbdb-mail-search (records)