# HG changeset patch
# User John Bailey <rekkanoryo@rekkanoryo.org>
# Date 1304306849 0
# Node ID 76595d4edf8630fd3a2c4cf0dcf60268ad2f445b
# Parent  a4ba3b194ce3b4d4972ff3574a7aa400017a10bc
Add a couple items to the !ChangeLog.  Refs #12891.

diff -r a4ba3b194ce3 -r 76595d4edf86 ChangeLog
--- a/ChangeLog	Mon May 02 03:23:23 2011 +0000
+++ b/ChangeLog	Mon May 02 03:27:29 2011 +0000
@@ -6,6 +6,8 @@
 	  bandwidth for silent periods during a call. (Jakub Adam) (half of #13180)
 	* Added the DigiCert High Assurance CA-3 intermediate CA, needed for
 	  validation of the Facebook XMPP interface's certificate.
+	* Removed the QQ protocol plugin.  It hasn't worked in a long time and
+	  isn't being maintained, therefore we no longer want it.
 
 	Pidgin:
 	* Duplicate code cleanup.  (Gabriel Schulhof) (#10599)
@@ -30,6 +32,8 @@
 	  (#13505)
 	* When removing a buddy, delete the pounces associated with it.
 	  (Kartik Mohta) (#1131)
+	* media: Allow libpurple and plugins to set SDES properties for RTP
+	  conferences. (Jakub Adam) (#12981)
 
 	Gadu-Gadu:
 	* Allow showing your status only to buddies. (Mateusz Piękos) (#13358)