Mercurial > pidgin.yaz
annotate doc/oscar/On_Sending_Files_via_OSCAR.odt @ 25805:6fed1bb3b02e
Fix merge
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Wed, 17 Dec 2008 18:23:36 +0000 |
parents | 2e3eba412412 |
children |
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Wed, 17 Dec 2008 18:23:36 +0000 |
parents | 2e3eba412412 |
children |