Mercurial > pidgin
diff ChangeLog @ 26132:edd2cebdead8
Manual merging...
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Mon, 02 Mar 2009 19:47:17 +0000 |
parents | 33b8ac883b33 |
children | f98049a447f2 7a3458436140 |
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Mon, 02 Mar 2009 19:47:17 +0000 |
parents | 33b8ac883b33 |
children | f98049a447f2 7a3458436140 |