| commit | 5ec0468e0a048ae72ae0ef176ecc317d7b3876a7 | |
| author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | |
| Thu, 31 Jul 2014 10:19:40 +0000 (31 12:19 +0200) | ||
| committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | |
| Thu, 31 Jul 2014 10:19:40 +0000 (31 12:19 +0200) | ||
| tree | 24bbf1d6a27021e9759b9f4b5906dbd6bd307f98 | treesnapshot (tar.gz zip) |
| parent | cc7d7575714fc3b5a1f149ab4476c8690fe68184 | commitdiff |
| parent | f5065b2ff66c64118e19304127b019f7d556256c | commitdiff |
Merge branch 'maint'
Conflicts:
lisp/org-element.el
Conflicts:
lisp/org-element.el
| lisp/org-element.el | diff1 | diff2 | blobhistory |