]> code.delx.au - gnu-emacs-elpa/commitdiff
delx.au / code / gnu-emacs-elpa / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 59492ab 5661ed0)
Merge branch 'server' into elisp
authorJackson Ray Hamilton <jackson@jacksonrayhamilton.com>
Sat, 6 Jun 2015 08:16:41 +0000 (01:16 -0700)
committerJackson Ray Hamilton <jackson@jacksonrayhamilton.com>
Sat, 6 Jun 2015 08:16:41 +0000 (01:16 -0700)

Trivial merge