# HG changeset patch
# User Ethan Blanton <elb@pidgin.im>
# Date 1336237944 0
# Node ID bcea57ced98c26a35f49202bf47ace3085bddc11
# Parent  31e66fce43d1e8f19d563c9b8f1f6a093b57ac16# Parent  8331b45b620067bf3f63f8032c2f26169ba374fb
merge of '8221dbe34324b88bd2852356a0028f0a81cda2bd'
     and 'c7169cd66afdf09bee74aea8c512261c73a195fe'

diff -r 31e66fce43d1 -r bcea57ced98c libpurple/protocols/irc/msgs.c