Merge commit '3e5c11a13981a1ff613cb4442ad644285c44e481' from gnorb

diff --cc packages/gnorb/README.org
Simple merge

diff --cc packages/gnorb/gnorb-bbdb.el
Simple merge

diff --cc packages/gnorb/gnorb-gnus.el
Simple merge

diff --cc packages/gnorb/gnorb-org.el
Simple merge

diff --cc packages/gnorb/gnorb-registry.el
Simple merge

diff --cc packages/gnorb/gnorb-utils.el
Simple merge

diff --cc packages/gnorb/gnorb.el
index 22531d21018125342f2cc378deffb61ae587486e,cb7d908d7b5fe65e4b0272e1b4fe6fa069ef5194..0c9557eda728b3de58cbf0ce3ba4d730fd022963
--- 1/packages/gnorb/gnorb.el
--- 2/gnorb.el
+++ b/packages/gnorb/gnorb.el
@@@ -38,7 -38,8 +38,7 @@@
  (with-eval-after-load 'bbdb
    (require 'gnorb-bbdb))
  (with-eval-after-load 'org
-  (require 'gnorb-org))
+   (require 'gnorb-org))
  
 -
  (provide 'gnorb)
  ;;; gnorb.el ends here

diff --cc packages/gnorb/gnorb.info
Simple merge

diff --cc packages/gnorb/gnorb.org
Simple merge

diff --cc packages/gnorb/gnorb.texi
Simple merge

diff --cc packages/gnorb/nngnorb.el
Simple merge