Merge branch 'master' of code.orgmode.org:bzg/org-mode

lisp/org-pcomplete.el

@@ -64,6 +64,7 @@
 (defvar org-outline-regexp)
 (defvar org-property-re)
 (defvar org-startup-options)
+(defvar org-tag-re)
 (defvar org-time-stamp-formats)
 (defvar org-todo-keywords-1)
 (defvar org-todo-line-regexp)

lisp/ox-latex.el

@@ -179,7 +179,7 @@
     ("et" . "estonian")
     ("eu" . "basque")
     ("fi" . "finnish")
-    ("fr" . "frenchb")
+    ("fr" . "french")
     ("fr-ca" . "canadien")
     ("gl" . "galician")
     ("hr" . "croatian")