pidgin: 5c6e241e: merge of '0f830f30f43a1884816673b67f0931...

[markdoliner at pidgin.im]

----------------------------------------------------------------------
Revision: 5c6e241e6e7b81067380dccbbd1660845b2ef74e
Parent:   0f830f30f43a1884816673b67f0931e686e3eb43
Parent:   7252f6d90b58743d43846859e467f2cf4a79c864
Author:   markdoliner at pidgin.im
Date:     02/18/12 18:43:18
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/5c6e241e6e7b81067380dccbbd1660845b2ef74e

Changelog: 

merge of '0f830f30f43a1884816673b67f0931e686e3eb43'
     and '7252f6d90b58743d43846859e467f2cf4a79c864'

Changes against parent 0f830f30f43a1884816673b67f0931e686e3eb43

  patched  ChangeLog

Changes against parent 7252f6d90b58743d43846859e467f2cf4a79c864

no changes