# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1251749256 0
# Node ID 02c62c9ad8222bd17db09f54c18b49a0e4d82196
# Parent  7f447db0e03bbf6efec5c17d4d97d13f15f31707# Parent  86e6df9a0c8048cfa5b672ecaa865df1acca455d
merge of '72c558ad4f7ad4f6c3ef1347e9d202cebdfaed83'
     and 'eb7f43240a9076b19941ad012cb5b9046f5cd0ce'

diff -r 7f447db0e03b -r 02c62c9ad822 ChangeLog
--- a/ChangeLog	Mon Aug 31 20:06:36 2009 +0000
+++ b/ChangeLog	Mon Aug 31 20:07:36 2009 +0000
@@ -19,6 +19,11 @@
 	  the form "room@conference.example.net/User", where
 	  room@conference.example.net is a MUC.
 
+	Yahoo!/Yahoo! JAPAN:
+	* Accounts now have "Use account proxy for SSL connections" option.  This
+	  option force-overrides the account specific proxy settings for SSL
+	  connections only and instead uses the global proxy configuration.
+
 	Finch:
 	* Properly detect libpanel on OpenBSD.  (Brad Smith)
 	* Remove IO watches in gnt_quit.  (Tomasz Mon)