Mercurial > pidgin
diff libpurple/plugins/joinpart.c @ 17142:9fd39a035729
explicit merge of '61827fc1671b97df72194ee9722ed122cb45c29f'
and 'fd6c233ae7838b2c5e1e8a177019a21f91e4a923'
to branch 'im.pidgin.pidgin'
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Sat, 19 May 2007 07:52:26 +0000 |
| parents | de2946d55a2d |
| children | 0f4a562b38d1 |
