Mercurial > pidgin.yaz
diff NEWS @ 25802:e3bb0bbfa388
Fix merge
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Tue, 02 Dec 2008 22:55:49 +0000 |
parents | 4490b3002b89 |
children | a60655fc1b4f |
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Tue, 02 Dec 2008 22:55:49 +0000 |
parents | 4490b3002b89 |
children | a60655fc1b4f |