HCoop / bpt / emacs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e92b6c8 31fd4b3)
Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 22 Jun 2011 16:25:06 +0000 (09:25 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 22 Jun 2011 16:25:06 +0000 (09:25 -0700)

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