]> code.delx.au - gnu-emacs-elpa/commitdiff
delx.au / code / gnu-emacs-elpa / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a2ba1ef 7b2a4c8)
Merge branch 'master' into develop
authorJackson Ray Hamilton <jackson@jacksonrayhamilton.com>
Tue, 6 Jan 2015 09:40:06 +0000 (01:40 -0800)
committerJackson Ray Hamilton <jackson@jacksonrayhamilton.com>
Tue, 6 Jan 2015 09:40:06 +0000 (01:40 -0800)

Trivial merge