HCoop Git - bpt/emacs.git/commit

author	Paul Eggert <eggert@cs.ucla.edu>
	Wed, 18 Apr 2012 16:45:13 +0000 (09:45 -0700)
committer	Paul Eggert <eggert@cs.ucla.edu>
	Wed, 18 Apr 2012 16:45:13 +0000 (09:45 -0700)
commit	6c94c34fe8fef20680c29731277ad8baf87bf47e
tree	f7a054d06b2a030ce73f298c41baaa14310dfcb8	tree \| snapshot (tar.gz zip)
parent	e36899b642d36b3e0280e8e3914f7bbc28e75f9d	commit \| diff
parent	bc6494efe328c6b6da13bafd95e035da4e36ca98	commit \| diff

Merge from trunk.

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