Merge branch 'master' into 7167-keep-rsync-test-setup
authorradhika <radhika@curoverse.com>
Fri, 9 Oct 2015 22:00:56 +0000 (18:00 -0400)
committerradhika <radhika@curoverse.com>
Fri, 9 Oct 2015 22:00:56 +0000 (18:00 -0400)
commit1841871773da24d4a743bf9083e1fa461a510125
treee095e599846689f8c351643487fd9c88d2397884
parent2f3634990e8c2d9b374c99d7432a188f43175a35
parente55f6e9fcb652a2b1505364b34d9d48e79adaeaf
Merge branch 'master' into 7167-keep-rsync-test-setup

Conflicts:
sdk/go/keepclient/perms.go
sdk/go/keepclient/perms_test.go
services/keepstore/perms.go
services/keepstore/perms_test.go
sdk/go/keepclient/keepclient.go
sdk/go/keepclient/support.go