| commit | a2f8a48ab5823acd5de1dde9f8a9a4a3bc7533a3 | |
| author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | |
| Thu, 6 Nov 2014 23:16:42 +0000 (7 00:16 +0100) | ||
| committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | |
| Thu, 6 Nov 2014 23:16:42 +0000 (7 00:16 +0100) | ||
| tree | 66fdf27c465e84f05389dc8ba78f5a5b9529df37 | treesnapshot (tar.gz zip) |
| parent | c177d3ca9edc63a96687d582865e1fa1779c600f | commitdiff |
| parent | d4a4fc740ed7d9f3664cdd85679c0fe8eed794e0 | commitdiff |
Merge branch 'maint'
Conflicts:
lisp/ox.el
Conflicts:
lisp/ox.el
| lisp/ox.el | diff1 | diff2 | blobhistory |