merge Merge branch 'master' of https://repo.eecs.berkeley.edu/git/users/manfer/fileProxy
merge
Merge branch 'master' of https://repo.eecs.berkeley.edu/git/users/manfer/fileProxy

tmroeder/cloudproxy,jlmucb/cloudproxy,cjpatton/cloudproxy,jlmucb/cloudproxy,William-J-Earl/cloudproxy,tmroeder/cloudproxy,cjpatton/cloudproxy,jethrogb/cloudproxy,jlmucb/cloudproxy,William-J-Earl/cloudproxy,tmroeder/cloudproxy,William-J-Earl/cloudproxy,cjpatton/cloudproxy,William-J-Earl/cloudproxy,kevinawalsh/cloudproxy,tmroeder/cloudproxy,jethrogb/cloudproxy,tmroeder/cloudproxy,jethrogb/cloudproxy,jlmucb/cloudproxy,jethrogb/cloudproxy,cjpatton/cloudproxy,jlmucb/cloudproxy,jethrogb/cloudproxy,kevinawalsh/cloudproxy,William-J-Earl/cloudproxy,cjpatton/cloudproxy