Merge from emacs--rel--22
authorMiles Bader <miles@gnu.org>
Tue, 30 Sep 2008 00:47:51 +0000 (00:47 +0000)
committerMiles Bader <miles@gnu.org>
Tue, 30 Sep 2008 00:47:51 +0000 (00:47 +0000)
commit26e06f4464c58704889bdc536edc25b73e8c0179
tree2c3af68685a493044871a60180a99d0d0c3ccae8
parent79f66be1b987cf350d3c76a27db822e27355773a
parent5720659f1a84d3ee1bb23294ad4bc06332293927
Merge from emacs--rel--22

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1435
admin/nt/README-ftp-server