Merge with purple-proxy-to-gio

Thu, 06 Oct 2016 10:09:08 -0400

author
Daniel Atallah <datallah@pidgin.im>
date
Thu, 06 Oct 2016 10:09:08 -0400
changeset 38125
4c0628af9bc6
parent 38124
73431003749d (current diff)
parent 38106
362dfad68aa5 (diff)
child 38126
cf6753bd9941

Merge with purple-proxy-to-gio

mercurial