| commit | eb0b98d91f9f695321ee26b9d959654bdd3755f0 | |
| author | Bastien Guerry <bzg@altern.org> | |
| Fri, 11 Apr 2014 10:22:48 +0000 (11 12:22 +0200) | ||
| committer | Bastien Guerry <bzg@altern.org> | |
| Fri, 11 Apr 2014 10:22:48 +0000 (11 12:22 +0200) | ||
| tree | c22cd55ccb8dbac0822f029bd5d5e35ad5737976 | treesnapshot (tar.gz zip) |
| parent | e8112c86ecd5c39bcda641aa2daa7ad3909edd7a | commitdiff |
| parent | faa1703b8f9c2bc2d1b9317c29fde75b764f41fc | commitdiff |
Merge branch 'maint'
Conflicts:
lisp/org.el
Conflicts:
lisp/org.el
| lisp/org.el | diff1 | diff2 | blobhistory |