Mercurial > pidgin.yaz
diff AUTHORS @ 29669:23f07a817807
Manual merge
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Mon, 02 Mar 2009 21:52:16 +0000 |
parents | 681e58ea3a9b |
children | 6c3c8e2c5f4f |
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Mon, 02 Mar 2009 21:52:16 +0000 |
parents | 681e58ea3a9b |
children | 6c3c8e2c5f4f |