]> code.delx.au - gnu-emacs/commitdiff
delx.au / code / gnu-emacs / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1aecd7e d3d0842)
Merge.
authorAlan Mackenzie <acm@muc.de>
Fri, 28 Oct 2011 15:18:00 +0000 (15:18 +0000)
committerAlan Mackenzie <acm@muc.de>
Fri, 28 Oct 2011 15:18:00 +0000 (15:18 +0000)

Trivial merge