Mercurial > pidgin
diff ChangeLog.API @ 25209:e3bb0bbfa388
Fix merge
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Tue, 02 Dec 2008 22:55:49 +0000 |
parents | 587c55f92a6f |
children | 9ca3ddf937f2 f89bdd34c9f1 38a2f78f80a7 12b8ccc3e9ec 11cb7f2bb6e8 |