Mercurial > pidgin
diff AUTHORS @ 20413:fd7b501cc9c8
fix up broken merge
author | Ka-Hing Cheung <khc@hxbc.us> |
---|---|
date | Sat, 12 May 2007 19:35:18 +0000 |
parents | 56042b2f8b64 |
children | 2b82b01e016a |
author | Ka-Hing Cheung <khc@hxbc.us> |
---|---|
date | Sat, 12 May 2007 19:35:18 +0000 |
parents | 56042b2f8b64 |
children | 2b82b01e016a |