HCoop / bpt / emacs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a690a97 d647b7c)
Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 14 Jun 2011 00:58:31 +0000 (17:58 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 14 Jun 2011 00:58:31 +0000 (17:58 -0700)

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