]> git.eshelyaron.com Git - emacs.git/commitdiff
projects / emacs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 20e006f 1b4f0a9)
Merge branch 'master' into scratch/org-mode-merge
authorBastien <bzg@gnu.org>
Mon, 3 Jul 2017 07:06:29 +0000 (09:06 +0200)
committerBastien <bzg@gnu.org>
Mon, 3 Jul 2017 07:06:29 +0000 (09:06 +0200)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.