Mercurial > pidgin
changeset 30227:16738cb6bb6b
merge of '7c3cd4e07a01085a68042131f5075778e65b1ab6'
and 'bc180436ff3297311929813e3dc6a1a77baa8817'
| author | Marcus Lundblad <ml@update.uu.se> |
|---|---|
| date | Wed, 30 Jun 2010 21:38:27 +0000 |
| parents | c31e1c0cf27f (current diff) bc4771aff549 (diff) |
| children | a47346a46cb7 5ec2d3617538 |
| files | |
| diffstat | 1 files changed, 1 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
