| commit | 967783215bfe8484661ebfe57688d8b5829d24ac | |
| author | Bastien Guerry <bzg@altern.org> | |
| Sat, 31 Mar 2012 09:04:40 +0000 (31 11:04 +0200) | ||
| committer | Bastien Guerry <bzg@altern.org> | |
| Sat, 31 Mar 2012 09:04:40 +0000 (31 11:04 +0200) | ||
| tree | 6aaec47e08e905c9c9b77021006e552347dde2b1 | treesnapshot (tar.gz zip) |
| parent | 1977df99a4a17b7495b6a7e2ad373d4e7677a757 | commitdiff |
| parent | dca5af369c698961a36a32dc78eaa15e14ea808e | commitdiff |
Merge branch 'hotfix-7.8.06'
Conflicts:
lisp/org.el
Conflicts:
lisp/org.el