Merge from trunk.
authorEli Zaretskii <eliz@gnu.org>
Thu, 16 May 2013 09:58:56 +0000 (12:58 +0300)
committerEli Zaretskii <eliz@gnu.org>
Thu, 16 May 2013 09:58:56 +0000 (12:58 +0300)
commita9519e2685d19b13ce4e3e1ba13f97569013627e
tree6a9e0e35514c400749f23c891e9a95577fb9bfc1
parent3946d31b7bcf2a7dceacb86598823360f457cd19
parent2d4bf34b5b83b3728b2fb18a72536f3e14afcf34
Merge from trunk.
Makefile.in
lisp/loadup.el
nt/makefile.w32-in
src/Makefile.in