Merge branch 'master' of orgmode.org:org-mode
treee9d03b3c6cd0dd286c1fadf17247e26f239173ec
-rw-r--r-- 75 .dir-locals.el
-rw-r--r-- 75 .dir-settings.el
-rw-r--r-- 772 .gitignore
-rw-r--r-- 93 .gitmodules
drwxr-xr-x - BUGFIXING
drwxr-xr-x - EXPERIMENTAL
-rw-r--r-- 14168 Makefile
-rw-r--r-- 1138 README
-rw-r--r-- 1051 README_DIST
-rw-r--r-- 3300 README_GIT
-rw-r--r-- 11765 README_maintainer
drwxr-xr-x - UTILITIES
drwxr-xr-x - contrib
drwxr-xr-x - doc
drwxr-xr-x - lisp
-rw-r--r-- 1007 request-assign-future.txt
drwxr-xr-x - testing