| commit | f11accd3ee8f4a2eaaf570ecd6b93d862b1fc9f4 | |
| author | Bastien Guerry <bzg@altern.org> | |
| Thu, 24 Jan 2013 15:36:36 +0000 (24 16:36 +0100) | ||
| committer | Bastien Guerry <bzg@altern.org> | |
| Thu, 24 Jan 2013 15:36:36 +0000 (24 16:36 +0100) | ||
| tree | e4c1f1ca63fdd57bd4dda92e4f64bbab803fa79b | treesnapshot (tar.gz zip) |
| parent | 6f3cb7a8b5cb66d2ffe07fdcfb59e8fd983539f9 | commitdiff |
| parent | 97f0951d142e78e31f7fccb9a4dd79f3578a194f | commitdiff |
Merge branch 'maint'
Conflicts:
lisp/org.el
Conflicts:
lisp/org.el
| lisp/org.el | diff1 | diff2 | blobhistory |