Mercurial > pidgin
diff ChangeLog @ 29275:23f07a817807
Manual merge
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Mon, 02 Mar 2009 21:52:16 +0000 |
parents | 7d58d7a3c5c3 |
children | 96814f0cfe49 |
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Mon, 02 Mar 2009 21:52:16 +0000 |
parents | 7d58d7a3c5c3 |
children | 96814f0cfe49 |