pidgin.2.x.y: ff142855: merge of '22d544ffc6215f22b81d1dc34931ba...

Sun May 6 13:55:48 EDT 2012

----------------------------------------------------------------------
Revision: ff142855237badeceb6d61e1d96f0410f94d6eaf
Parent:   22d544ffc6215f22b81d1dc34931bad4c82775c2
Parent:   886d323c01f7c8cdf2a5e4ff42eefbab045b1f1f
Author:   markdoliner at pidgin.im
Date:     05/06/12 13:52:46
Branch:   im.pidgin.pidgin.2.x.y
URL: http://d.pidgin.im/viewmtn/revision/info/ff142855237badeceb6d61e1d96f0410f94d6eaf

Changelog: 

merge of '22d544ffc6215f22b81d1dc34931bad4c82775c2'
     and '886d323c01f7c8cdf2a5e4ff42eefbab045b1f1f'

Changes against parent 22d544ffc6215f22b81d1dc34931bad4c82775c2

  patched  ChangeLog.API
  patched  configure.ac

Changes against parent 886d323c01f7c8cdf2a5e4ff42eefbab045b1f1f

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