changeset 20227:5a352cb00fc3

applied changes from 6ce1cc1ed82e1940fd7b17f4ca3c8350885117fa through 33aead6e626883ef6ad44b79099f01d2da042d9a
author Richard Laager <rlaager@wiktel.com>
date Fri, 28 Sep 2007 15:49:55 +0000
parents a772d16ad8a8
children 0bf3907e62fd
files COPYRIGHT doc/pidgin.1.in
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/COPYRIGHT	Fri Sep 28 15:49:19 2007 +0000
+++ b/COPYRIGHT	Fri Sep 28 15:49:55 2007 +0000
@@ -290,6 +290,7 @@
 Nathan Poznick
 Jory A. Pratt
 Brent Priddy
+Justin Pryzby
 Federicco Mena Quintero
 Yosef Radchenko
 David Raeman
--- a/doc/pidgin.1.in	Fri Sep 28 15:49:19 2007 +0000
+++ b/doc/pidgin.1.in	Fri Sep 28 15:49:55 2007 +0000
@@ -140,7 +140,7 @@
 If \fIAuto-Login\fR is chosen, this account will automatically login upon
 starting Pidgin.
 
-Each protocol has it's own specific options that can be found in the
+Each protocol has its own specific options that can be found in the
 modify screen.
 
 .SH PREFERENCES