| commit | 8d7990acfa00af585d7957a00b2327da9b707411 | |
| author | Bastien Guerry <bzg@altern.org> | |
| Sat, 5 Jan 2013 16:29:06 +0000 (5 17:29 +0100) | ||
| committer | Bastien Guerry <bzg@altern.org> | |
| Sat, 5 Jan 2013 16:29:06 +0000 (5 17:29 +0100) | ||
| tree | e8746d442d4bc1d64a6a943280faa6541b07f4fc | treesnapshot (tar.gz zip) |
| parent | 5c2dd988a502f71a35b8bdcd77e03883fffc47a4 | commitdiff |
| parent | cad0b388ddc1b1c2360329d08ea13b8c9decbdff | commitdiff |
Merge branch 'maint'
Conflicts:
lisp/org.el
Conflicts:
lisp/org.el
| lisp/org.el | diff1 | diff2 | blobhistory |