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