# HG changeset patch
# User Mike Ruprecht <maiku@soc.pidgin.im>
# Date 1238786993 0
# Node ID 57324f0a0a83717f503d65d8e8440f4b9637f883
# Parent  90c65a8575bf191b4a2ea9ab1cb7a09296ad60b9# Parent  4103d15e42053ffff67968a6e03c85d98b570429
merge of 'e4b10961a2266d17625787c506f1b258ffa97873'
     and 'f25348fdce436002d7d508f074aaa70fd9491f01'

diff -r 90c65a8575bf -r 57324f0a0a83 libpurple/media.h
--- a/libpurple/media.h	Fri Apr 03 19:28:00 2009 +0000
+++ b/libpurple/media.h	Fri Apr 03 19:29:53 2009 +0000
@@ -488,7 +488,7 @@
 #endif
 
 /**
- * Gets remote candidates from the stream.
+ * Sets remote candidates from the stream.
  *
  * @param media The media object to find the session in.
  * @param sess_id The session id of the session find the stream in.