Merge from emacs-24; up to 2012-05-05T02:50:20Z!monnier@iro.umontreal.ca
authorGlenn Morris <rgm@gnu.org>
Wed, 5 Sep 2012 07:05:56 +0000 (00:05 -0700)
committerGlenn Morris <rgm@gnu.org>
Wed, 5 Sep 2012 07:05:56 +0000 (00:05 -0700)
commit7e570fbf3ef8ccd31df2651f5d2775c5697d5950
tree2a722a870a0240ded0b1fcffb34f52a1d7d668e3
parent1a1ecd2b14f38fcd995516a71b49c8810eac5828
parentf1220388bca64f31182daacfb2eefcc8053af11a
Merge from emacs-24; up to 2012-05-05T02:50:20Z!monnier@iro.umontreal.ca
lisp/ChangeLog
lisp/calendar/holidays.el
lisp/emulation/cua-rect.el
lisp/play/blackbox.el
lisp/progmodes/flymake.el
lisp/progmodes/sh-script.el
lisp/textmodes/picture.el