| commit | aa0bfcdcdb741de942fe2b035332036df2f99e6d | |
| author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | |
| Sun, 14 Dec 2014 08:41:38 +0000 (14 09:41 +0100) | ||
| committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | |
| Sun, 14 Dec 2014 08:41:38 +0000 (14 09:41 +0100) | ||
| tree | c630de7502eaf27eeb4c07403b0acbb34d67a7d4 | treesnapshot (tar.gz zip) |
| parent | c262dd7f14a3c8c51ea3d495b7388bf641e90e9e | commitdiff |
| parent | 89a0acc75eda785a92c99efc9b617b89e8327f8b | commitdiff |
Merge branch 'maint'
Conflicts:
lisp/ob-core.el
Conflicts:
lisp/ob-core.el
| lisp/ob-core.el | diff1 | diff2 | blobhistory |