HCoop Git - bpt/emacs.git/commit

author	Paul Eggert <eggert@cs.ucla.edu>
	Tue, 17 Apr 2012 21:38:34 +0000 (14:38 -0700)
committer	Paul Eggert <eggert@cs.ucla.edu>
	Tue, 17 Apr 2012 21:38:34 +0000 (14:38 -0700)
commit	ae6e112df045de8ddc22e85f8538975d4664b325
tree	3923d0ff634b043c69f87255b52619d195dfc6ad	tree \| snapshot (tar.gz zip)
parent	ad85a071cc6d583041969d300793c92f21a54696	commit \| diff
parent	197b6f3c605872bfeb7b2024d255142d8f579021	commit \| diff

Merge from trunk.

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