diff libpurple/protocols/jabber/JEPS @ 27346:9a2c1c6ad899

merge of '0db5728dd6db78a86154abd7e8e7cf32db421f7c' and 'a77ae8c1cf4a1b0c52b53de1d45a4cd86f42cafb'
author Etan Reisner <pidgin@unreliablesource.net>
date Sun, 28 Jun 2009 15:49:35 +0000
parents 5fe8042783c1
children 1c542f86dbcf
line wrap: on
line diff