merge emacs-23

b295da47 · Kenichi Handa · 769ae9e1 · 8818c329 · b295da47
Commit b295da47 authored Aug 29, 2010 by Kenichi Handa
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

etc/ChangeLog etc/ChangeLog +1 -1

No files found.
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
-2010-08-22  Alex Harsanyi <harsanyi@mac.com>
+2010-08-22  Alex Harsanyi  <harsanyi@mac.com>  (tiny change)

 	* emacs3.py: Import imp module and use it (Bug#5756).