diff doc/the_penguin.txt @ 27761:0e49276d9ba1

merge of '69e3f1859964483e117264088d4b6fc214709f6a' and 'b66da85de52dbcd99da3c6571add291b12b427ea'
author Mike Ruprecht <maiku@soc.pidgin.im>
date Fri, 31 Jul 2009 04:21:30 +0000
parents eb63f9960d07
children
line wrap: on
line diff