Merge branch 'maint' of orgmode.org:org-mode into maint
treebb8c25feb52b31783b3a7f13121bc884bad59785
-rw-r--r-- 333 .dir-locals.el
-rw-r--r-- 333 .dir-settings.el
-rw-r--r-- 848 .gitignore
-rw-r--r-- 93 .gitmodules
-rw-r--r-- 35147 COPYING
-rw-r--r-- 3559 Makefile
-rw-r--r-- 1221 README
-rw-r--r-- 923 README_ELPA
-rw-r--r-- 3592 README_contribute
-rw-r--r-- 1424 README_git
-rw-r--r-- 7424 README_maintainer
drwxr-xr-x - contrib
drwxr-xr-x - doc
drwxr-xr-x - etc
drwxr-xr-x - lisp
drwxr-xr-x - mk
-rw-r--r-- 1007 request-assign-future.txt
drwxr-xr-x - testing