Merge branch camel-socks-proxy-master for SOCKS5 / IPv6 support
authorFederico Mena Quintero <federico@novell.com>
Thu, 12 Aug 2010 23:12:36 +0000 (18:12 -0500)
committerFederico Mena Quintero <federico@novell.com>
Thu, 12 Aug 2010 23:12:36 +0000 (18:12 -0500)
commit3a5fb1f1d3cfdcf64173518138bc0e4c02bb6a64
tree4b630eeb2b058247f4b14508009bf9eb7ffac5b0
parent6d4660f280b2a2952437031156556d007afd2ae1
parent4f17f0f452958d711a5290356058008b4ed68663
Merge branch camel-socks-proxy-master for SOCKS5 / IPv6 support

Signed-off-by: Federico Mena Quintero <federico@novell.com>
camel/camel-http-stream.c
camel/camel-tcp-stream-ssl.c
camel/camel-tcp-stream-ssl.h
camel/camel-tcp-stream.c
camel/providers/imap/camel-imap-store.c
camel/providers/imapx/camel-imapx-server.c
camel/providers/nntp/camel-nntp-store.c
camel/providers/pop3/camel-pop3-store.c
camel/providers/smtp/camel-smtp-transport.c