applied partial changes from d6d62482a33ec2323ec2efb4e5e6be42257e66d3
authorZachary West <zacwest@gmail.com>
Sun, 5 Jul 2009 19:41:00 +0000 (19:41 +0000)
committerZachary West <zacwest@gmail.com>
Sun, 5 Jul 2009 19:41:00 +0000 (19:41 +0000)
commit0a9d96b4c592f0d0740610f9d0c7f89e2380e21b
treee2a03f772feb19ed27d357e2ae697a7c55126031
parent30b3afd065c652ccaf6bc9ddda650c79cddb6493
applied partial changes from d6d62482a33ec2323ec2efb4e5e6be42257e66d3
                     through ae4e1a6ad5b5058239a63399cfcac51570912378

applied changes from 89e296ce85f6724fd51ae1efdc5883941cdf90ca
             through 1d57dde9d15fd79af85e8a28d21680c4a1b6be2b

applied changes from d6d0af3753826ea4715b3f4ca3bd41f0d63161b3
             through 89e296ce85f6724fd51ae1efdc5883941cdf90ca

applied changes from 1d57dde9d15fd79af85e8a28d21680c4a1b6be2b
             through b05f93669b412dc123c17699c1c394cb2f30673d

applied changes from b05f93669b412dc123c17699c1c394cb2f30673d
             through dc960b2ad7b32fa7d865552300a003a71689cfe9

applied changes from 5668e3b116ab205b1a3270d6aff7fca0332bccc6
             through 7f396ae5ae1a07562f3822bfdf32a5b71b737970
libpurple/protocols/jabber/google.c
libpurple/protocols/yahoo/yahoo.c