| commit | 38ffaf061e2ea343d9e5d87c3628acfa28a2ca2a | |
| author | Bastien Guerry <bzg@altern.org> | |
| Tue, 22 Apr 2014 09:18:58 +0000 (22 11:18 +0200) | ||
| committer | Bastien Guerry <bzg@altern.org> | |
| Tue, 22 Apr 2014 09:18:58 +0000 (22 11:18 +0200) | ||
| tree | cc908bb240be817f992820e33f2c47ea3a022b9a | treesnapshot (tar.gz zip) |
| parent | f588f6d88476b7941c64b3e3099138cd5d334132 | commitdiff |
| parent | fdb4b54e92aff9bbe7fec6209813af17a14eb876 | commitdiff |
Merge branch 'maint'
Conflicts:
lisp/org.el
Conflicts:
lisp/org.el
| lisp/org.el | diff1 | diff2 | blobhistory |