| commit | c57372d5fa047f1060712e559b22c9cce2dfd88e | |
| author | Nicolas Goaziou <n.goaziou@gmail.com> | |
| Sun, 10 Nov 2013 10:47:06 +0000 (10 11:47 +0100) | ||
| committer | Nicolas Goaziou <n.goaziou@gmail.com> | |
| Sun, 10 Nov 2013 10:47:06 +0000 (10 11:47 +0100) | ||
| tree | 49e6e5e392b576596c6e394d042eb9a7588177ff | treesnapshot (tar.gz zip) |
| parent | ca100eaa01c21b4494352e42658254ee5734c096 | commitdiff |
| parent | ede82ccf93648ebefdaac896e875f5a17c148241 | 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 |