Merge branch 'maint'
commit25f4e5f7f7491e295aac96d1f8ae1f4bedfc300c
authorBastien Guerry <bzg@altern.org>
Tue, 2 Jul 2013 07:32:09 +0000 (2 09:32 +0200)
committerBastien Guerry <bzg@altern.org>
Tue, 2 Jul 2013 07:32:09 +0000 (2 09:32 +0200)
treed07c0847e2bcdd37757dff0839fe8c7267e48868
parent116a66c5bea451fff291fe26ab742b845cde288b
parent4eddd17ba752b3ae923fd2e4c76d217dd2b00d54
Merge branch 'maint'
doc/org.texi
lisp/org.el