| commit | 442b2ad15dc49358f60ca17aa0c6d58a639061d5 | |
| author | Nicolas Goaziou <n.goaziou@gmail.com> | |
| Sat, 15 Dec 2012 23:49:22 +0000 (16 00:49 +0100) | ||
| committer | Nicolas Goaziou <n.goaziou@gmail.com> | |
| Sat, 15 Dec 2012 23:49:22 +0000 (16 00:49 +0100) | ||
| tree | 8c4c9c4aa468e1f8b5fb16c58445b20af811d018 | treesnapshot (tar.gz zip) |
| parent | 458824493d7d403e7c017a38843606b7d0f4be44 | commitdiff |
| parent | 20839ced710269d4c40eadaf480a71723ca41807 | commitdiff |
Merge branch 'maint'
Conflicts:
lisp/org-element.el
Conflicts:
lisp/org-element.el
| lisp/org-element.el | diff1 | diff2 | blobhistory |
| testing/lisp/test-org-element.el | diff1 | diff2 | blobhistory |