Merge branch 'master' of orgmode.org:org-mode
tree247513e32864b6187ea53385eb204f507d2674f3
-rw-r--r-- 333 .dir-locals.el
-rw-r--r-- 333 .dir-settings.el
-rw-r--r-- 858 .gitignore
-rw-r--r-- 95 .gitmodules
-rw-r--r-- 35147 COPYING
-rw-r--r-- 3632 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-- 8172 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