Mercurial > pidgin.yaz
diff COPYING @ 30951:090e141a5214
Some merge-resolving...
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Fri, 08 Jan 2010 23:33:44 +0000 |
parents | 2341958e33b5 |
children |
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Fri, 08 Jan 2010 23:33:44 +0000 |
parents | 2341958e33b5 |
children |