# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1190998279 0
# Node ID fd664b4aa4f1960a08144837972d43ab12b1c452
# Parent  0c868dfe23438f0b9a31a0b77c3eadf5b337711d# Parent  02df6998b466d58190288dc699abbc71b7048d7a
merge of '41f188f15baaa4c23c5c2ec80a04faff63ee1977'
     and 'ff01e2a2ebb49e3467357819cb6522baa4c9207c'

diff -r 0c868dfe2343 -r fd664b4aa4f1 libpurple/protocols/msn/userlist.c
diff -r 0c868dfe2343 -r fd664b4aa4f1 pidgin/gtknotify.c