summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2014-01-10 09:30:07 (GMT)
committer Bastien Guerry <bzg@altern.org>2014-01-10 09:30:07 (GMT)
commit3f8aee0ed09dc6031346c9b1abbe2b003e0cc53b (patch)
treee51993851082b0088acc530ef71d54eb5d21fff2
parent2c782da8019de4eded3b5686fcfffa51abda1585 (diff)
parentbe63eb69050ce78b20f2c410eba8301fe1d460a2 (diff)
downloadorg-mode-3f8aee0ed09dc6031346c9b1abbe2b003e0cc53b.zip
org-mode-3f8aee0ed09dc6031346c9b1abbe2b003e0cc53b.tar.gz
Merge branch 'maint'
-rw-r--r--etc/ORG-NEWS2
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index 2f9d156..fb20b5c 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -1069,7 +1069,7 @@ See http://orgmode.org/elpa/
| =k= | | [[doc::org-agenda-capture][org-agenda-capture]] |
| 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