| commit | 36b497720d85af627f93cc4eb68ac9bed4a8e3f8 | |
| author | Nicolas Goaziou <n.goaziou@gmail.com> | |
| Wed, 23 Apr 2014 20:04:20 +0000 (23 22:04 +0200) | ||
| committer | Nicolas Goaziou <n.goaziou@gmail.com> | |
| Wed, 23 Apr 2014 20:04:20 +0000 (23 22:04 +0200) | ||
| tree | a1687cab55b8c8d3d52ee545491cccb446f54447 | treesnapshot (tar.gz zip) |
| parent | 4c40dc65d0a5b048d40b1d48fd23089a19db7f70 | commitdiff |
| parent | 94ae862515dd00b56959b4385b3c1eda8cb754d6 | commitdiff |
Merge branch 'maint'
Conflicts:
lisp/org-element.el
Conflicts:
lisp/org-element.el
| lisp/org-element.el | diff1 | diff2 | blobhistory |