| commit | dda9461fbbc3346ef8cd5ae237d647c84178927a | |
| author | Nicolas Goaziou <n.goaziou@gmail.com> | |
| Sat, 1 Feb 2014 22:33:58 +0000 (1 23:33 +0100) | ||
| committer | Nicolas Goaziou <n.goaziou@gmail.com> | |
| Sat, 1 Feb 2014 22:33:58 +0000 (1 23:33 +0100) | ||
| tree | dc16d27be333c381fe9dc1f0a5f802f6518dce91 | treesnapshot (tar.gz zip) |
| parent | 8b1ffc717bbad83a9e0df644583c9b7945b59774 | commitdiff |
| parent | 8e1386cead0e4296f7bb063d07d64dd95ec0b231 | commitdiff |
Merge branch 'maint'
Conflicts:
lisp/org-element.el
Conflicts:
lisp/org-element.el
| lisp/org-element.el | diff1 | diff2 | blobhistory |