| commit | 5ab647af6488219350e3419241d4282598689f69 | |
| author | Bastien Guerry <bzg@altern.org> | |
| Wed, 13 Feb 2013 11:10:45 +0000 (13 12:10 +0100) | ||
| committer | Bastien Guerry <bzg@altern.org> | |
| Wed, 13 Feb 2013 11:10:45 +0000 (13 12:10 +0100) | ||
| tree | 0d14ecd0761d4409452ae53886c4cd412d229a60 | treesnapshot (tar.gz zip) |
| parent | 990385e7a3f0d0b48b5e453727cb5756479a2459 | commitdiff |
| parent | 718b210009e69bb92dcd1730065b9b848a2b0aa9 | commitdiff |
Merge branch 'maint'
Conflicts:
doc/org.texi
Conflicts:
doc/org.texi
| doc/org.texi | diff1 | diff2 | blobhistory |
| lisp/org-element.el | diff1 | diff2 | blobhistory |
| lisp/org.el | diff1 | diff2 | blobhistory |