Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 7 Jan 2012 19:51:13 +0000 (11:51 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 7 Jan 2012 19:51:13 +0000 (11:51 -0800)
commit9a0115abd18f219f234d6dd460cf7f5ed3c0332f
tree3ea55596e8d2fbb066b4387d86b509d8f8a1a612
parentdbf17d8b483f08f9506c19ef95e894fca62b8ec7
parent6c1bd3f369c39aac648b085c5e9e4e9b42c65c62
Merge from trunk.
lisp/ChangeLog
lisp/epg.el
lisp/files.el
src/ChangeLog
src/fileio.c