| commit | 7e5249c9fdb65845fa427f48f00c4748d948ba6f | |
| author | Bastien <bzg@gnu.org> | |
| Wed, 20 May 2015 06:00:54 +0000 (20 08:00 +0200) | ||
| committer | Bastien <bzg@gnu.org> | |
| Wed, 20 May 2015 06:00:54 +0000 (20 08:00 +0200) | ||
| tree | ab9c8dc42449c5725c341d74a68760fe608a51a7 | treesnapshot (tar.gz zip) |
| parent | c8bfd52f5f5329ad514fa6aef6ec283e3c7a233b | commitdiff |
| parent | 42228a99ca23157a66ef187834c71f29e7e039a4 | commitdiff |
Merge branch 'maint'
Conflicts:
lisp/org-list.el
Conflicts:
lisp/org-list.el
| lisp/org-list.el | diff1 | diff2 | blobhistory |
| lisp/org-macs.el | diff1 | diff2 | blobhistory |