merge of '18b0a096bd6f21011f16c7b08c1aac016d2c0fff'
authorZachary West <zacwest@gmail.com>
Thu, 9 Jul 2009 20:43:20 +0000 (20:43 +0000)
committerZachary West <zacwest@gmail.com>
Thu, 9 Jul 2009 20:43:20 +0000 (20:43 +0000)
commita7d680199e82dfb1421678232c38ea747ea98924
treebb540fc1a24698dd3d542db275963700408d729f
parent5232eabb595a2df7c8a160efda76d2775f7e4f29
parentb2496308f008c2dae7a9466b39e498ee6dd2dea6
Merge ... '18b0a096bd6f21011f16c7b08c1aac016d2c0fff'
     and 'ccdb44b03ebf0792b3b57531c03ae4e66086d8e2'
libpurple/protocols/yahoo/yahoo.c