comparison libpurple/proxy.c @ 32792:670296a688dc

merge of '19d8fa4275ceeb945882502e55b5c9581d1646da' and '4efee4948f792833531b79dfc45a885b483cb09d'
author Mark Doliner <mark@kingant.net>
date Sun, 06 May 2012 06:05:11 +0000
parents 9f26efb70c67
children 0c2efa69492b 5ae7e1f36b43
comparison
equal deleted inserted replaced
32791:c18caa631628 32792:670296a688dc