Mercurial > pidgin
diff ChangeLog.API @ 27083:8671d9a37002
Fix merge error.
author | Elliott Sales de Andrade <qulogic@pidgin.im> |
---|---|
date | Mon, 08 Jun 2009 04:42:33 +0000 |
parents | d46acd32a18d |
children | 19cbe3af6167 38c4973b5222 |
author | Elliott Sales de Andrade <qulogic@pidgin.im> |
---|---|
date | Mon, 08 Jun 2009 04:42:33 +0000 |
parents | d46acd32a18d |
children | 19cbe3af6167 38c4973b5222 |