| commit | 76cca82fc1c566ef6fbbb27c16baef05dcaed12e | |
| author | Bastien Guerry <bzg@altern.org> | |
| Tue, 26 Feb 2013 15:14:03 +0000 (26 16:14 +0100) | ||
| committer | Bastien Guerry <bzg@altern.org> | |
| Tue, 26 Feb 2013 15:14:03 +0000 (26 16:14 +0100) | ||
| tree | 00b932a507a27d8721f9b9383c36109266ee5d95 | treesnapshot (tar.gz zip) |
| parent | 04fd44708aa608fda11786b3fc6a0c64be65b283 | commitdiff |
| parent | 95375260e5c6b3ff6fa306b6effec9098b1ef37b | commitdiff |
Merge branch 'maint'
Conflicts:
lisp/org.el
Conflicts:
lisp/org.el
| contrib/oldexp/org-exp.el | diff1 | diff2 | blobhistory |
| lisp/org-docview.el | diff1 | diff2 | blobhistory |