# HG changeset patch
# User John Bailey <rekkanoryo@rekkanoryo.org>
# Date 1301349324 0
# Node ID c7af571e5b7923e39f147c1199eb4667d3eeaf16
# Parent  25d12d5929e065d804895f9f5912b3c2e138f984# Parent  4a26e623aeac76a9818a976c5161e8c5418b99bc
merge of '8225619bc6916576c4c3ba198c023dbba87d8f95'
     and 'cf60754e39ca2f5aa7f21f3f766366cd840e871c'

diff -r 25d12d5929e0 -r c7af571e5b79 COPYRIGHT
--- a/COPYRIGHT	Mon Mar 28 21:53:46 2011 +0000
+++ b/COPYRIGHT	Mon Mar 28 21:55:24 2011 +0000
@@ -541,6 +541,7 @@
 Jon Turney
 Junichi Uekawa
 Max Ulidtko
+Dmitry Utkin
 Igor Vlasenko
 István Váradi
 Martijn van Beers
diff -r 25d12d5929e0 -r c7af571e5b79 ChangeLog
--- a/ChangeLog	Mon Mar 28 21:53:46 2011 +0000
+++ b/ChangeLog	Mon Mar 28 21:55:24 2011 +0000
@@ -39,8 +39,8 @@
 	* Ignore Daylight Saving Time when performing calculations related to
 	  birthdays. (Dustin Gathmann) (#13533)
 	* It is now possible to specify multiple encodings on the Advanced tab of
-	  an ICQ account's settings by using a comma-delimited list.  (loentar)
-	  (#13496)
+	  an ICQ account's settings by using a comma-delimited list.  (Dmitry
+	  Utkin (#13496)
 
 	Plugins:
 	* The Voice/Video Settings plugin now includes the ability to test