Merge branch 'master' into 2751-python-sdk-keep-proxy-support
authorPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 21 May 2014 18:31:22 +0000 (14:31 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 21 May 2014 18:31:22 +0000 (14:31 -0400)
commit77d3ed33f525bd6859580954c6d7b9b36b394b98
treefe2e8539867bfac5b93ac384e43bf97580fb1a4e
parente5b58426fb9064da76b207cd6d8aaaff05331d64
parentebf002120164e185691b6bf418a17b23124614a8
Merge branch 'master' into 2751-python-sdk-keep-proxy-support