Merge with release-2.x.y

Thu, 13 Nov 2014 03:58:07 -0500

author
Elliott Sales de Andrade <qulogic@pidgin.im>
date
Thu, 13 Nov 2014 03:58:07 -0500
changeset 36260
a728314b1306
parent 36257
c5445f25f90f (current diff)
parent 36259
2c1483188cf5 (diff)
child 36281
017310ea69c0
child 37435
ba23590365e3

Merge with release-2.x.y

libpurple/dnsquery.c file | annotate | diff | comparison | revisions
libpurple/protocols/msn/slplink.c file | annotate | diff | comparison | revisions

mercurial