Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2014-01-10 10:30:07 +01:00
commit 3f8aee0ed0
1 changed files with 1 additions and 1 deletions

View File

@ -1069,7 +1069,7 @@ See http://orgmode.org/elpa/
| =k= | | [[doc::org-agenda-capture][org-agenda-capture]] | | =k= | | [[doc::org-agenda-capture][org-agenda-capture]] |
| C-c , | , | [[doc::org-priority][org-priority]] | | C-c , | , | [[doc::org-priority][org-priority]] |
** New package and Babel langage ** New package and Babel language
*** =org-eshell.el= by Konrad Hinsen is now in Org *** =org-eshell.el= by Konrad Hinsen is now in Org