| commit | 2c78ca4a563fbc1b62413bfab2626ca9e2a86d5d | |
| author | Nicolas Goaziou <n.goaziou@gmail.com> | |
| Fri, 5 Oct 2012 23:21:27 +0000 (6 01:21 +0200) | ||
| committer | Nicolas Goaziou <n.goaziou@gmail.com> | |
| Fri, 5 Oct 2012 23:21:27 +0000 (6 01:21 +0200) | ||
| tree | eda00930880db20eb18a34de4c869a518be0e1b0 | treesnapshot (tar.gz zip) |
| parent | 78d2bd7edcc28e2f5bd5bcde5f8d47ab09f2f0ed | commitdiff |
| parent | ad99ea914711d75eca03e7fdf3383f275d2ffa3b | 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 |