changeset 23544:3ca9800a9be3

merge of '1a465eae5dc1b7bfc09b0724788403c096f461ce' and '532937221446ba2643f5101c22ae58abc83fa1be'
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Mon, 14 Jul 2008 03:04:03 +0000
parents d8e83a6a4127 (current diff) af402fc34cb3 (diff)
children faaa1b36a9b2
files COPYRIGHT
diffstat 2 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/COPYRIGHT	Sun Jul 13 23:28:37 2008 +0000
+++ b/COPYRIGHT	Mon Jul 14 03:04:03 2008 +0000
@@ -8,7 +8,6 @@
 Dave Ahlswede
 Manuel Amador
 Matt Amato
-Elliott Sales de Andrade
 Geoffrey Antos
 Daniel Atallah
 Paul Aurich
@@ -230,6 +229,7 @@
 Wesley Lin
 Artem Litvinovich
 Josh Littlefield
+Daniel Ljungborg
 Syd Logan
 Lokheed
 Norberto Lopes
@@ -340,6 +340,7 @@
 Michael Ruprecht
 Sam S.
 Thanumalayan S.
+Elliott Sales de Andrade
 Tomasz Sałaciński <tsalacinski@gmail.com>
 Pradyumna Sampath
 Arvind Samptur
--- a/ChangeLog	Sun Jul 13 23:28:37 2008 +0000
+++ b/ChangeLog	Mon Jul 14 03:04:03 2008 +0000
@@ -12,7 +12,8 @@
 
 	MSN:
 	* Update MSN support to protocol 15 (Elliott Sales de Andrade, Jorge
-	  Villaseñor, Mike Ruprecht, Carlos Silva, Ma Yuan, Dimmuxx and others)
+	  Villaseñor, Mike Ruprecht, Carlos Silva, Ma Yuan, Daniel Ljungborg
+	  and others)
 	* Personal messages are now supported. They are treated as status
 	  messages.
 	* Offline IM is now supported.