Merge from trunk.
authorEli Zaretskii <eliz@gnu.org>
Mon, 9 Dec 2013 17:20:34 +0000 (19:20 +0200)
committerEli Zaretskii <eliz@gnu.org>
Mon, 9 Dec 2013 17:20:34 +0000 (19:20 +0200)
1  2 
etc/NEWS
src/emacs.c
src/w32term.c

diff --cc etc/NEWS
Simple merge
diff --cc src/emacs.c
Simple merge
diff --cc src/w32term.c
Simple merge