| commit | 95dd398f6aad65fe42f52cd0b6a5f321eabf37e2 | |
| author | Nicolas Goaziou <n.goaziou@gmail.com> | |
| Sun, 21 Jul 2013 13:54:08 +0000 (21 15:54 +0200) | ||
| committer | Nicolas Goaziou <n.goaziou@gmail.com> | |
| Sun, 21 Jul 2013 13:54:08 +0000 (21 15:54 +0200) | ||
| tree | 1edcfdaaa7da88f01dd6ae5d6c5a4548fae8d709 | treesnapshot (tar.gz zip) |
| parent | cc74ae8b7a9284efd7f2d5fb56e53cd97af40400 | commitdiff |
| parent | b4a8ec9321860d65f17c9fd348728a71d126a02b | 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 |