Mercurial > pidgin
diff doc/the_penguin.txt @ 32144:e7b7e36790f8
merge of '10d7899aac75e85039e557e2c4238e1b276a4353'
and '29e5737d31f8504f0f1b30ed6595671b0a735535'
author | Elliott Sales de Andrade <qulogic@pidgin.im> |
---|---|
date | Fri, 09 Sep 2011 03:32:27 +0000 |
parents | eb63f9960d07 |
children |