]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge.
authorAlan Mackenzie <acm@muc.de>
Sun, 15 Jan 2012 19:34:11 +0000 (19:34 +0000)
committerAlan Mackenzie <acm@muc.de>
Sun, 15 Jan 2012 19:34:11 +0000 (19:34 +0000)

Trivial merge