# HG changeset patch
# User John Bailey <rekkanoryo@rekkanoryo.org>
# Date 1265696710 0
# Node ID bafc2a8bb747caf77b4389685c751a65732e8011
# Parent  8594fde2ace38ac81a763f73b947b3639b273ee5
Proper credit for Kartik's patches.  Refs #7347, #7746.

diff -r 8594fde2ace3 -r bafc2a8bb747 COPYRIGHT
--- a/COPYRIGHT	Tue Feb 09 06:21:52 2010 +0000
+++ b/COPYRIGHT	Tue Feb 09 06:25:10 2010 +0000
@@ -311,6 +311,7 @@
 Paul Miller
 Arkadiusz Miskiewicz
 David Mohr
+Kartik Mohta
 Andrew Molloy
 Tomasz Mon
 Michael Monreal
diff -r 8594fde2ace3 -r bafc2a8bb747 ChangeLog
--- a/ChangeLog	Tue Feb 09 06:21:52 2010 +0000
+++ b/ChangeLog	Tue Feb 09 06:25:10 2010 +0000
@@ -45,6 +45,8 @@
 
 	Yahoo:
 	* Don't send <span> and </span> tags.  (Fartash Faghri)
+	* Support PingBox.  PingBoxes will appear as pbx/PingBoxName.  (Kartik
+	  Mohta)
 
 	Pidgin:
 	* Correctly size conversation and status box entries when the
@@ -53,6 +55,8 @@
 	  request form.  (Thanks to Florian Zeitz for finding this problem)
 	* Search friends by email-addresses in the buddy list. (Luoh Ren-Shan)
 	* Allow dropping an image on Custom Smiley window to add a new one.
+	* Prompt for confirmation when clearing a whiteboard (doodle) session.
+	  (Kartik Mohta)
 
 	Finch:
 	* Rebindable 'move-first' and 'move-last' actions for tree widgets. So