| commit | 5cca90edf8b5dca891e946cf0991e7c5e1a3661d | |
| author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | |
| Mon, 9 Jun 2014 16:11:19 +0000 (9 18:11 +0200) | ||
| committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | |
| Mon, 9 Jun 2014 16:11:19 +0000 (9 18:11 +0200) | ||
| tree | de346ab484a48b18b61960f287e3b10cfe119d6a | treesnapshot (tar.gz zip) |
| parent | 54ab0e1c60571eb4f002900a735a9379283b96c5 | commitdiff |
| parent | 8cc4e09950594b2abec2502e9218318570595ac5 | commitdiff |
Merge branch 'maint'
Conflicts:
lisp/org.el
testing/lisp/test-org.el
Conflicts:
lisp/org.el
testing/lisp/test-org.el
| lisp/org.el | diff1 | diff2 | blobhistory |
| testing/lisp/test-org.el | diff1 | diff2 | blobhistory |