From: Federico Mena Quintero Date: Tue, 14 Sep 2010 20:20:11 +0000 (-0500) Subject: Merge branch 'camel-socks-proxy-master' X-Git-Tag: upstream/3.7.4~2592 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6f6f1ca104dc9b5b4b58620dcfb6d6683ae7fce7;p=platform%2Fupstream%2Fevolution-data-server.git Merge branch 'camel-socks-proxy-master' --- 6f6f1ca104dc9b5b4b58620dcfb6d6683ae7fce7