| commit | 747d71675c9cc7059c1ba7175cdd80a11d478a77 | |
| author | Bastien Guerry <bzg@altern.org> | |
| Fri, 25 May 2012 07:42:02 +0000 (25 09:42 +0200) | ||
| committer | Bastien Guerry <bzg@altern.org> | |
| Fri, 25 May 2012 07:42:02 +0000 (25 09:42 +0200) | ||
| tree | 8aefc9d57cc4b439ecb9b14051ef00a3755acf5f | treesnapshot (tar.gz zip) |
| parent | f12e41e37c563a6774f8e8f6ca407a882f96e9a3 | commitdiff |
| parent | 60587ea91cb42ae8618666c7dae5b029f751b913 | commitdiff |
Merge branch 'maint'
Conflicts:
doc/org.texi
doc/orgguide.texi
lisp/org.el
Conflicts:
doc/org.texi
doc/orgguide.texi
lisp/org.el