| commit | d2643be6d8c0e2fd54a673117cf09e332ec18e01 | |
| author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | |
| Sun, 31 Aug 2014 09:43:27 +0000 (31 11:43 +0200) | ||
| committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | |
| Sun, 31 Aug 2014 09:43:27 +0000 (31 11:43 +0200) | ||
| tree | 6784322391e50a8068ee69206a4c4ff8c156352f | treesnapshot (tar.gz zip) |
| parent | 851b779d1a3780d921b9c37b81a6afd919f2c479 | commitdiff |
| parent | 37bf0576f2f2894c6e37239ee8db63a3ef21a840 | commitdiff |
Merge branch 'maint'
Conflicts:
lisp/org-element.el
Conflicts:
lisp/org-element.el
| lisp/org-element.el | diff1 | diff2 | blobhistory |
| lisp/org.el | diff1 | diff2 | blobhistory |
| testing/lisp/test-org-element.el | diff1 | diff2 | blobhistory |