Mercurial > emacs
diff etc/JOKES @ 107964:c269d35fafb2
Merge from mainline.
author | Katsumi Yamaoka <yamaoka@jpl.org> |
---|---|
date | Thu, 15 Apr 2010 22:43:50 +0000 |
parents | 02e2382f5e8a |
children |
author | Katsumi Yamaoka <yamaoka@jpl.org> |
---|---|
date | Thu, 15 Apr 2010 22:43:50 +0000 |
parents | 02e2382f5e8a |
children |