# HG changeset patch
# User Marcus Lundblad <ml@update.uu.se>
# Date 1222318279 0
# Node ID b19a3458e6b21a08e05971b702a073e7d56b8eb4
# Parent  9564593d170cfadb6ad226b1fecdf2fffbec04ca# Parent  1afb5c981a1f0d0dcc9044f69bd525e991ae1f08
merge of '59e2b9896f25e8517b3f0f4d742c143e6fccd6e0'
     and 'c2b5d965f04a15ae8caa5262870b9feae90390d9'

diff -r 9564593d170c -r b19a3458e6b2 ChangeLog
--- a/ChangeLog	Thu Sep 25 04:49:44 2008 +0000
+++ b/ChangeLog	Thu Sep 25 04:51:19 2008 +0000
@@ -26,6 +26,10 @@
 	* Sending and receiving custom smileys using the specification in
 	  XEP-0231 (bits of binary) and XHTML-IM
 
+	Yahoo:
+	* Only send a Ping once every hour.  This prevents the account from
+	  being disconnected from the server periodically.
+
 version 2.5.1 (08/30/2008):
 	libpurple:
 	* In the Join/Part plugin, add the ability to apply the rules to