Mercurial > pidgin

changeset 31442:c7af571e5b79

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge of '8225619bc6916576c4c3ba198c023dbba87d8f95' and 'cf60754e39ca2f5aa7f21f3f766366cd840e871c'
author John Bailey <rekkanoryo@rekkanoryo.org>
date Mon, 28 Mar 2011 21:55:24 +0000
parents 25d12d5929e0 (current diff) 4a26e623aeac (diff)
children 1551c9a140fd 91df50ae5e26
files
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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