comparison libpurple/protocols/jabber/Makefile.am @ 30511:4b7d599b5a00

merge of '745f55ef98eaf96a452eb54bb2c46f21845f9996' and 'b04f4322926ab2a4467fb2b9c11d9961e66d1a9c'
author Marcus Lundblad <ml@update.uu.se>
date Mon, 09 Nov 2009 19:27:45 +0000
parents f858b53dfbf0
children cb8b53a6f238
comparison
equal deleted inserted replaced
30509:0712ce23901e 30511:4b7d599b5a00