# HG changeset patch
# User Stu Tomlinson <stu@nosnilmot.com>
# Date 1178252236 0
# Node ID 38c134e2556b874a05dc703f417511bb970a888f
# Parent  90184b199e5823f0a66ea9ecb913a20b47bf5fb0# Parent  8c19752df0e6382d465f9da8d3989099185fb5b6
merge of 'bf466048990ccb60520e0e2e3aec2fb084bf3bf6'
     and 'dd1dbdb90917499ef006072e624eecd27708a816'

diff -r 90184b199e58 -r 38c134e2556b COPYRIGHT
--- a/COPYRIGHT	Fri May 04 04:15:57 2007 +0000
+++ b/COPYRIGHT	Fri May 04 04:17:16 2007 +0000
@@ -17,6 +17,7 @@
 Christopher Ayoup
 Alex Badea
 John Bailey
+R. Tyler Ballance
 Chris Banal
 Luca Barbato
 Levi Bard
diff -r 90184b199e58 -r 38c134e2556b ChangeLog
--- a/ChangeLog	Fri May 04 04:15:57 2007 +0000
+++ b/ChangeLog	Fri May 04 04:17:16 2007 +0000
@@ -199,8 +199,9 @@
 	* Removed the Napster and TOC protocols plugins
 
 	Other Noteworthy Changes:
-	* UPnP and NAT traversal support (Adam J. Warrington, Google Summer of
+	* NAT traversal support via UPnP (Adam J. Warrington, Google Summer of
 	  Code)
+	* NAT traversal support via NAT-PMP (Evan Schoenberg and R. Tyler Ballance)
 	* The modify account dialog now contains two tabs, which should display
 	  better at lower resolutions (Sadrul Habib Chowdhury)
 	* New "find buddy" results dialog (Alex Converse)