Merge branch 'maint' of code.orgmode.org:bzg/org-mode into maint
treee8d5d5447850302846880055e0f9ebd61bf6ea49
-rw-r--r-- 523 .dir-locals.el
-rw-r--r-- 891 .gitignore
-rw-r--r-- 95 .gitmodules
-rw-r--r-- 35147 COPYING
-rw-r--r-- 3633 Makefile
-rw-r--r-- 1225 README
-rw-r--r-- 925 README_ELPA
-rw-r--r-- 3368 README_contribute
-rw-r--r-- 1426 README_git
-rw-r--r-- 6697 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-- 980 request-assign-future.txt
drwxr-xr-x - testing