| commit | 78c4199310929fed0355eb8079ba2b1ce9503667 | |
| author | Bastien Guerry <bzg@altern.org> | |
| Tue, 26 Feb 2013 21:45:41 +0000 (26 22:45 +0100) | ||
| committer | Bastien Guerry <bzg@altern.org> | |
| Tue, 26 Feb 2013 21:45:41 +0000 (26 22:45 +0100) | ||
| tree | 977fd3e3049e2303ae4e325795a1079b068c46ca | treesnapshot (tar.gz zip) |
| parent | ebe0fbd6a8ea763c86784bb3e6a2b14109e9b1d7 | commitdiff |
| parent | 41882a99d3cf14e4c9ad45559bc3fc9e8b21b581 | commitdiff |
Merge branch 'maint'
Conflicts:
lisp/org.el
Conflicts:
lisp/org.el
| lisp/org-macs.el | diff1 | diff2 | blobhistory |
| lisp/org.el | diff1 | diff2 | blobhistory |