| commit | dfcfca82199f6846e4021831f7a93be5c8acb1ab | |
| author | Nicolas Goaziou <n.goaziou@gmail.com> | |
| Tue, 8 Apr 2014 16:59:06 +0000 (8 18:59 +0200) | ||
| committer | Nicolas Goaziou <n.goaziou@gmail.com> | |
| Tue, 8 Apr 2014 16:59:06 +0000 (8 18:59 +0200) | ||
| tree | d170c1086b659244cc692a995c3b90456ed431c1 | treesnapshot (tar.gz zip) |
| parent | 798bb8d42fb28b499480ee8bf9654e54f1f34207 | commitdiff |
| parent | 728661309e3b0b7fa81fff7805acbd022a82940f | 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 |