Mercurial > pidgin
diff INSTALL @ 25228:6fed1bb3b02e
Fix merge
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Wed, 17 Dec 2008 18:23:36 +0000 |
parents | f46ae7e62d13 |
children | 5ab7766a6c83 |
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Wed, 17 Dec 2008 18:23:36 +0000 |
parents | f46ae7e62d13 |
children | 5ab7766a6c83 |