diff HACKING @ 32790:bcea57ced98c

merge of '8221dbe34324b88bd2852356a0028f0a81cda2bd' and 'c7169cd66afdf09bee74aea8c512261c73a195fe'
author Ethan Blanton <elb@pidgin.im>
date Sat, 05 May 2012 17:12:24 +0000
parents d73ee2690376
children
line wrap: on
line diff