merge of '898b964a967c87502f1793757b405e60879021ae'
authorZachary West <zacwest@gmail.com>
Thu, 9 Jul 2009 21:03:02 +0000 (21:03 +0000)
committerZachary West <zacwest@gmail.com>
Thu, 9 Jul 2009 21:03:02 +0000 (21:03 +0000)
commit27b4c00e1ab1aa9a759439cae866da8398242ebd
tree3de1ca8785fb49884a65b9f1b54bab7acf9cab00
parent730f77ed727235f9a73c3eef053569f8fcafc594
parent70e10096377ba42709cd0af16db7c3ece7a98333
Merge ... '898b964a967c87502f1793757b405e60879021ae'
     and 'e8581a4c2a777afc5ce8a3d8d7ebb17d9cf93106'
libpurple/protocols/yahoo/yahoo.c