| commit | 3b4745d32ae4e54404511a9f28396b357f47d4ab | |
| author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | |
| Thu, 28 Aug 2014 09:10:15 +0000 (28 11:10 +0200) | ||
| committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | |
| Thu, 28 Aug 2014 09:10:15 +0000 (28 11:10 +0200) | ||
| tree | e070d13e65341e32991b6720ccf82e18a54c2a42 | treesnapshot (tar.gz zip) |
| parent | 5da35ee0cadd7d1f6282a8f4c03eabfcb54e281f | commitdiff |
| parent | 2e5b3dede103bba0071144ec7b7fc250471c1463 | 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 |