| commit | 451e20d982c600b2bf4308eeff7dfbe1d188b7ef | |
| author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | |
| Sat, 26 Jul 2014 13:10:22 +0000 (26 15:10 +0200) | ||
| committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | |
| Sat, 26 Jul 2014 13:10:22 +0000 (26 15:10 +0200) | ||
| tree | 9ee015c69ea22818eedd598eddec01ea590616af | treesnapshot (tar.gz zip) |
| parent | 08e77958598edc1fa83c452399587e74ecd4a03d | commitdiff |
| parent | 38ff96ecc37ebfe3b65b48c2b0a8a07264868b88 | commitdiff |
Merge branch 'maint'
Conflicts:
testing/lisp/test-org-element.el
Conflicts:
testing/lisp/test-org-element.el
| lisp/org-element.el | diff1 | diff2 | blobhistory |
| testing/lisp/test-org-element.el | diff1 | diff2 | blobhistory |