# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1190994595 0
# Node ID 5a352cb00fc333ce87ea045b62f996e678ffb54a
# Parent  a772d16ad8a8a7e084d5a960fe8573ebd1bee97e
applied changes from 6ce1cc1ed82e1940fd7b17f4ca3c8350885117fa
             through 33aead6e626883ef6ad44b79099f01d2da042d9a

diff -r a772d16ad8a8 -r 5a352cb00fc3 COPYRIGHT
--- 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
diff -r a772d16ad8a8 -r 5a352cb00fc3 doc/pidgin.1.in
--- 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