Mercurial > pidgin
diff doc/the_penguin.txt @ 16864:8c19752df0e6
merge of '2882b6ab8f7547ad0d1682e61648c6fe29a36f8a'
and '5cfdf53a0df94294f9feecae6d7dd22133bcb9ad'
author | Evan Schoenberg <evan.s@dreskin.net> |
---|---|
date | Fri, 04 May 2007 04:14:46 +0000 |
parents | eb63f9960d07 |
children |