| commit | 8898c380ab97b31e812cf9cfb8dfc8efd3f0543a | |
| author | Bastien Guerry <bzg@altern.org> | |
| Wed, 15 Jan 2014 08:22:59 +0000 (15 09:22 +0100) | ||
| committer | Bastien Guerry <bzg@altern.org> | |
| Wed, 15 Jan 2014 08:22:59 +0000 (15 09:22 +0100) | ||
| tree | 347357ac22d99e77a417d218c5866a1f30e5c7fa | treesnapshot (tar.gz zip) |
| parent | 8694aa9352b1d9e778174a6111d8494c6713fb45 | commitdiff |
| parent | 0a8fe04a9d832c228c048c4775541b59efeef2ae | commitdiff |
Merge branch 'maint'
Conflicts:
lisp/org.el
Conflicts:
lisp/org.el
| lisp/org.el | diff1 | diff2 | blobhistory |