Merge branch 'for-carsten' of git://git.norang.ca/org-mode

contrib/lisp/org-exp-blocks.el

@@ -375,4 +375,4 @@ export."
 	       (message (match-string 1 raw))
 	       (match-string 1 raw)))))))
 
-;;; org-exp-blocks.el ends here
+;;; org-exp-blocks.el ends here

lisp/org-gnus.el

@@ -140,6 +140,7 @@ If `org-store-link' was called with a prefix arg the meaning of
       (setq desc (org-email-link-description)
 	    link (org-gnus-article-link group newsgroups message-id x-no-archive))
       (org-add-link-props :link link :description desc)
+      (gnus-summary-toggle-header -1)
       link))))
 
 (defun org-gnus-open (path)

lisp/org.el

@@ -2353,7 +2353,7 @@ Use customize to modify this, or restart Emacs after changing it."
   :group 'org)
 
 (defcustom org-completion-use-ido nil
-  "Non-ni means, use ido completion wherever possible."
+  "Non-nil means, use ido completion wherever possible."
   :group 'org-completion
   :type 'boolean)