Merge from mainline.

This commit is contained in:
Paul Eggert 2011-01-17 11:01:01 -08:00
commit a3e44e7937
1875 changed files with 1750 additions and 3557 deletions

View file

@ -1802,7 +1802,5 @@ strerror (errnum)
#endif /* ! HAVE_STRERROR */
/* arch-tag: f39bb9c4-73eb-477e-896d-50832e2ca9a7
(do not change this comment) */
/* emacsclient.c ends here */