Merge from trunk; up to 2012-12-09T01:04:43Z!rgm@gnu.org.
[bpt/emacs.git] / msdos / emacs.ico
CommitLineData
a4a9692d 1