pidgin.2.x.y: f4eb85ca: merge of '8221dbe34324b88bd2852356a0028f...

[elb at pidgin.im]

----------------------------------------------------------------------
Revision: f4eb85ca42d285bb5a1663659b1f166a540413c2
Parent:   8221dbe34324b88bd2852356a0028f0a81cda2bd
Parent:   c7169cd66afdf09bee74aea8c512261c73a195fe
Author:   elb at pidgin.im
Date:     05/05/12 13:12:24
Branch:   im.pidgin.pidgin.2.x.y
URL: http://d.pidgin.im/viewmtn/revision/info/f4eb85ca42d285bb5a1663659b1f166a540413c2

Changelog: 

merge of '8221dbe34324b88bd2852356a0028f0a81cda2bd'
     and 'c7169cd66afdf09bee74aea8c512261c73a195fe'

Changes against parent 8221dbe34324b88bd2852356a0028f0a81cda2bd

no changes

Changes against parent c7169cd66afdf09bee74aea8c512261c73a195fe

  patched  ChangeLog
  patched  libpurple/protocols/irc/msgs.c