Merge from emacs-24
commitef247dc5c87e97ede53fa33e038194a75e0c835d
authorStefan Monnier <monnier@iro.umontreal.ca>
Tue, 17 Jul 2012 11:52:00 +0000 (17 07:52 -0400)
committerStefan Monnier <monnier@iro.umontreal.ca>
Tue, 17 Jul 2012 11:52:00 +0000 (17 07:52 -0400)
tree256c6649b318a78e0f7e090378c57ccabe554d5d
parentb330745d4c6f5668cedb949064235b78a16dcec9
parent0b3b3616c2b66e822c6b4091f764ef27f995b0c3
Merge from emacs-24
12 files changed:
admin/CPP-DEFINES
admin/ChangeLog
admin/bzrmerge.el
lisp/ChangeLog
lisp/gnus/ChangeLog
lisp/gnus/shr.el
lisp/progmodes/sh-script.el
src/ChangeLog
src/buffer.c
src/dired.c
src/fileio.c
src/s/msdos.h