diff libpurple/proxy.c @ 26646:6559bf971fcd

merge of '79565c78f0c63b6c8f1b52e57e6e928780ce4f65' and 'a1c902f30c51b755e7c047ab91f9dae471e8d007'
author Paul Aurich <paul@darkrain42.org>
date Sun, 12 Apr 2009 23:47:43 +0000
parents 4b8c4870b13a
children 4c3b1bb3ba91
line wrap: on
line diff