# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1259818722 0
# Node ID ba1cefa627925ca318920a6db5e61361debccf59
# Parent  5e11c572d730bc8c7d08a34e9d666bf27dd96d13# Parent  de319028ad284d79363e9b327f7052c7bb33d556
merge of 'aa4524ddbe6f9ac48cb518a473fdc68773665bef'
     and 'd612071593881b9ae7e92a1820cf13d3e45b1f94'

diff -r 5e11c572d730 -r ba1cefa62792 ChangeLog
--- a/ChangeLog	Wed Dec 02 22:27:55 2009 +0000
+++ b/ChangeLog	Thu Dec 03 05:38:42 2009 +0000
@@ -15,9 +15,6 @@
 	* Actually emit the hold signal for media calls.
 	* Fix building the GnuTLS plugin with older versions of GnuTLS.
 	* Fix DNS TXT query resolution.
-	* Don't send Proxy-Authorization headers to HTTP proxy servers until we've
-	  received a "407 Proxy Authentication Required" response from the server.
-	  (thecrux)
 	* Added "MXit" protocol plugin, supported and maintained by the MXit folks
 	  themselves (MXit Lifestyle (Pty) Ltd.)