Merge branch 'master' of orgmode.org:org-mode
treeaab8c761dfa950ff762167eaad35ef486527a841
-rw-r--r-- 75 .dir-locals.el
-rw-r--r-- 75 .dir-settings.el
-rw-r--r-- 810 .gitignore
-rw-r--r-- 93 .gitmodules
-rw-r--r-- 3201 Makefile
-rw-r--r-- 1138 README
-rw-r--r-- 1054 README_DIST
-rw-r--r-- 3522 README_GIT
-rw-r--r-- 11757 README_maintainer
drwxr-xr-x - UTILITIES
drwxr-xr-x - contrib
-rw-r--r-- 3360 default.mk
drwxr-xr-x - doc
drwxr-xr-x - etc
drwxr-xr-x - lisp
-rw-r--r-- 1007 request-assign-future.txt
-rw-r--r-- 3007 targets.mk
drwxr-xr-x - testing