comparison pidgin/pidginstock.c @ 30140:a3b78a080a5b

merge of '1993306ee130a8c1c8eb294a1a05f86aa098cb9f' and 'e5c9e334137918bc4e82fa4a3305623348817152'
author Paul Aurich <paul@darkrain42.org>
date Wed, 14 Apr 2010 19:58:42 +0000
parents bd28b8515eb2
children 3ed54142386f
comparison
equal deleted inserted replaced
30138:62cc2156961f 30140:a3b78a080a5b