Merge branch 'maint'

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

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.10
+The version of this release is: 7.8.11
 
 The homepage of Org is at http://orgmode.org
 

doc/orgcard.tex

@@ -1,5 +1,5 @@
 % Reference Card for Org Mode
-\def\orgversionnumber{7.8.10}
+\def\orgversionnumber{7.8.11}
 \def\versionyear{2012}          % latest update
 \def\year{2012}                 % latest copyright year