Merge branch 'maint'

Conflicts:
	doc/org.texi
	lisp/org.el

4 files changed, 10 insertions, 4 deletions

diff --git a/README_DIST b/README_DIST
index 9360658..b8baaa3 100644
--- a/README_DIST
+++ b/README_DIST
@@ -1,7 +1,7 @@
 The is a distribution of Org, a plain text notes and project planning
 tool for Emacs.
 
-The version of this release is: 7.8.09
+The version of this release is: 7.8.10
 
 The homepage of Org is at http://orgmode.org
 
diff --git a/doc/orgcard.tex b/doc/orgcard.tex
index d06afca..6bebbaa 100644
--- a/doc/orgcard.tex
+++ b/doc/orgcard.tex
@@ -1,5 +1,5 @@
 % Reference Card for Org Mode
-\def\orgversionnumber{7.8.09}
+\def\orgversionnumber{7.8.10}
 \def\versionyear{2012}          % latest update
 \def\year{2012}                 % latest copyright year
 
diff --git a/doc/orgguide.texi b/doc/orgguide.texi
index a23a532..9e80f5e 100644
--- a/doc/orgguide.texi
+++ b/doc/orgguide.texi
@@ -3,8 +3,8 @@
 @setfilename ../../info/orgguide
 @settitle The compact Org-mode Guide
 
-@set VERSION 7.8.09
-@set DATE April 2012
+@set VERSION 7.8.10
+@set DATE mai 2012
 
 @c Use proper quote and backtick for code sections in PDF output
 @c Cf. Texinfo manual 14.2
diff --git a/lisp/org.el b/lisp/org.el
index 66f9c3e..1b68d88 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -209,7 +209,13 @@ identifier."
 
 ;;; Version
 
+<<<<<<< HEAD
 (defvaralias 'org-version 'org-release)
+=======
+(defconst org-version "7.8.10"
+  "The version number of the file org.el.")
+
+>>>>>>> maint
 ;;;###autoload
 (defun org-version (&optional here)
   "Show the org-mode version in the echo area.