diff pidgin/pidginstock.h @ 22387:ff1258551f79

merge of 'b3b5983d1eb17af3007d26447c9215e9e8203189' and 'd1ef38716fb62522b4d8ce47ed39d9e34d2b2c77'
author Jeffrey Connelly <jaconnel@calpoly.edu>
date Sun, 02 Mar 2008 20:08:27 +0000
parents c0ad0943cd6e
children 62b5d52c3d66 a8a26b4d8458
line wrap: on
line diff