# HG changeset patch
# User John Bailey <rekkanoryo@rekkanoryo.org>
# Date 1301349324 0
# Node ID d40dd2b308c23276e3daa0d5084d4dbd9ce2acd3
# Parent  2e75912ea4e64bacebb2de9893a6240ee295f1c4# Parent  bd3d48300a4b3573b7a33072cbc984da28a80267
merge of '2e75912ea4e64bacebb2de9893a6240ee295f1c4'
     and 'bd3d48300a4b3573b7a33072cbc984da28a80267'

diff -r 2e75912ea4e6 -r d40dd2b308c2 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 2e75912ea4e6 -r d40dd2b308c2 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